Development

Changeset 3513

You must first sign up to be able to contribute.

Changeset 3513

Show
Ignore:
Timestamp:
02/19/07 14:42:16 (2 years ago)
Author:
fabien
Message:

reverted r3325

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/lib/generator/sfCrudGenerator.class.php

    r3331 r3513  
    8787 
    8888    $this->setTheme($theme); 
    89  
    90     $templateFiles = array_merge( 
    91       sfFinder::type('file')->name('*.php')->relative()->in(sfLoader::getGeneratorTemplate($this->getGeneratorClass(), 'default', '').'/templates'), 
    92       sfFinder::type('file')->name('*.php')->relative()->in($themeDir.'/templates') 
    93     ); 
    94  
    95     $configFiles = array_merge( 
    96       sfFinder::type('file')->name('*.yml')->relative()->in(sfLoader::getGeneratorTemplate($this->getGeneratorClass(), 'default', '').'/config'), 
    97       sfFinder::type('file')->name('*.yml')->relative()->in($themeDir.'/config') 
    98     ); 
     89    $templateFiles = sfFinder::type('file')->name('*.php')->relative()->in($themeDir.'/templates'); 
     90    $configFiles = sfFinder::type('file')->name('*.yml')->relative()->in($themeDir.'/config'); 
    9991 
    10092    $this->generatePhpFiles($this->generatedModuleName, $templateFiles, $configFiles); 
  • branches/1.0/lib/generator/sfGenerator.class.php

    r3302 r3513  
    6969      $this->getGeneratorManager()->getCache()->set($template, $generatedModuleName.DIRECTORY_SEPARATOR.'templates', $retval); 
    7070    } 
    71      
     71 
    7272    // generate config files 
    7373    foreach ($configFiles as $config)