diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 23:24:32 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 23:24:32 +0100 |
| commit | 2425f2f90331a014d3b276629089135fbd849a42 (patch) | |
| tree | 12b8c710384aaed67dfb048c5dc1d5e74d1e2fec /system/core/Common.php | |
| parent | 352d60e9f3a65def29e02a4507ef742eac255333 (diff) | |
| parent | 0609d588a4340fc9a9cfbc0ff76c39bba9ab09fb (diff) | |
Merge pull request #897 from IT-Can/develop-fixes-896
Fixes for issue #896
Diffstat (limited to 'system/core/Common.php')
| -rw-r--r-- | system/core/Common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 6ef229629..1f59c02d7 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -235,7 +235,7 @@ if ( ! function_exists('get_config')) } // Is the config file in the environment folder? - if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT..'/config.php')) + if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) { $file_path = APPPATH.'config/config.php'; } |