summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
Diffstat (limited to 'system/core/CodeIgniter.php')
-rwxr-xr-xsystem/core/CodeIgniter.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 04f346c7c..97527e5ca 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -59,7 +59,14 @@
* Load the framework constants
* ------------------------------------------------------
*/
- load_environ_config('constants', TRUE);
+ if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php'))
+ {
+ require(APPPATH.'config/'.ENVIRONMENT.'/constants.php');
+ }
+ else
+ {
+ require(APPPATH.'config/constants.php');
+ }
/*
* ------------------------------------------------------