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/database | |
| parent | 1b74e70c0cfd3aedcfa427b655e2ad3868bff531 (diff) | |
Remove unnecessary defined('ENVIRONMENT') checks
As suggested in issue #2134 & PR #2149
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index f94685c51..d9104747f 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -43,7 +43,7 @@ function &DB($params = '', $query_builder_override = NULL) if (is_string($params) && strpos($params, '://') === FALSE) { // Is the config file in the environment folder? - if (( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database.php')) + if ( ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database.php') && ! file_exists($file_path = APPPATH.'config/database.php')) { show_error('The configuration file database.php does not exist.'); |