diff options
Diffstat (limited to 'framework/TApplication.php')
| -rw-r--r-- | framework/TApplication.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/TApplication.php b/framework/TApplication.php index 8101672e..21b00576 100644 --- a/framework/TApplication.php +++ b/framework/TApplication.php @@ -324,13 +324,13 @@ class TApplication extends TComponent // determine configuration path and file if(empty($basePath) || ($basePath=realpath($basePath))===false) throw new TConfigurationException('application_basepath_invalid',$basePath); - if(is_file($basePath)) + if(is_file($basePath.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) + $configFile=$basePath.DIRECTORY_SEPARATOR.self::CONFIG_FILE; + else if(is_file($basePath)) { $configFile=$basePath; $basePath=dirname($configFile); } - else if(is_file($basePath.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) - $configFile=$basePath.DIRECTORY_SEPARATOR.self::CONFIG_FILE; else $configFile=null; |