Development

Changeset 8515

You must first sign up to be able to contribute.

Changeset 8515

Show
Ignore:
Timestamp:
04/17/08 20:55:15 (7 months ago)
Author:
fabien
Message:

changed sfProjectConfiguration::getApplicationConfiguration() so that sfProjectConfiguration is not initialized twice (closes #3273)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/config/sfProjectConfiguration.class.php

    r8417 r8515  
    279279    $class = $application.'Configuration'; 
    280280 
    281     if (is_null(sfProjectConfiguration::$active)) 
    282     { 
    283       // force initialization of sf_apps_dir config setting 
    284       new ProjectConfiguration(null, $dispatcher); 
    285     } 
    286  
    287     require_once sfConfig::get('sf_apps_dir').'/'.$application.'/config/'.$class.'.class.php'; 
    288  
    289281    if (is_null($rootDir)) 
    290282    { 
    …… 
    292284    } 
    293285 
     286    require_once $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php'; 
     287 
    294288    return new $class($environment, $debug, $rootDir, $dispatcher); 
    295289  }