diff options
Diffstat (limited to 'system/database/DB.php')
| -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.'); |