diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
| commit | 358ffec0a6b2a1fcc55e09623619126671d3e65f (patch) | |
| tree | 6888d3f0a73500575db564cb4e5dbe5b828e4589 /system/core/CodeIgniter.php | |
| parent | d9f0a1496af1dfca7c317028708b2cd1e5727cea (diff) | |
| parent | 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (diff) | |
Merge pull request #826 from EllisLab/feature/abstract-config-load
Abstracting the loading of files in the config directory depending on environments
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rwxr-xr-x | system/core/CodeIgniter.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 97527e5ca..04f346c7c 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -59,14 +59,7 @@ * Load the framework constants * ------------------------------------------------------ */ - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php')) - { - require(APPPATH.'config/'.ENVIRONMENT.'/constants.php'); - } - else - { - require(APPPATH.'config/constants.php'); - } + load_environ_config('constants', TRUE); /* * ------------------------------------------------------ |