diff options
| author | joelcox <joel@mickly.com> | 2011-01-15 23:09:47 +0100 |
|---|---|---|
| committer | joelcox <joel@mickly.com> | 2011-01-15 23:09:47 +0100 |
| commit | cee8075e2f8fdeb0d8516b5af8ae7cd7754ac513 (patch) | |
| tree | 7cba1d3ea12370bb7b8031585c6604cc7087cc1f /system/core/Common.php | |
| parent | 87a5cf3ee39cb76ff2ba50d49ca5d03588a3fd9f (diff) | |
Split basic configuration in three environments, providing fallback to global
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 6a3d5ac0a..48de161d2 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -209,13 +209,13 @@ } // Fetch the config file - if ( ! file_exists(APPPATH.'config/config'.EXT)) + if ( ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/config'.EXT)) { exit('The configuration file does not exist.'); } else { - require(APPPATH.'config/config'.EXT); + require(APPPATH.'config/'.ENVIRONMENT.'/config'.EXT); } // Does the $config array exist in the file? |