diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:00:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:00:02 +0100 |
| commit | db529ca1e13e9f9e1c73be20c3b92a7adc3c6aa2 (patch) | |
| tree | d4f4ecff21af8f6e09eb764546b8bdb02646148a /system/core/Common.php | |
| parent | 1b74e70c0cfd3aedcfa427b655e2ad3868bff531 (diff) | |
Remove unnecessary defined('ENVIRONMENT') checks
As suggested in issue #2134 & PR #2149
Diffstat (limited to 'system/core/Common.php')
| -rw-r--r-- | system/core/Common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index d494caf80..90cc5b3a4 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -241,7 +241,7 @@ if ( ! function_exists('get_config')) } // Is the config file in the environment folder? - if (defined('ENVIRONMENT') && file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) + if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) { require($file_path); } @@ -316,7 +316,7 @@ if ( ! function_exists('get_mimes')) { static $_mimes = array(); - if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { $_mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'); } |