summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-03-15 22:01:39 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-03-15 22:01:39 +0100
commit35f6491450d8564b26cbfab90aedcd0e592a81d4 (patch)
tree5af2698fb6be6a23d0258560fc5598398ee12ba6 /system
parentfba54e1278be65c8b600e3311c283342a597afab (diff)
constants.php will be loaded from the environment specific config folder if available.
Diffstat (limited to 'system')
-rw-r--r--system/core/CodeIgniter.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 99c261e74..39a4d7ffd 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -53,7 +53,14 @@
* Load the framework constants
* ------------------------------------------------------
*/
- require(APPPATH.'config/constants'.EXT);
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants'.EXT))
+ {
+ require(APPPATH.'config/'.ENVIRONMENT.'/constants'.EXT);
+ }
+ else
+ {
+ require(APPPATH.'config/constants'.EXT);
+ }
/*
* ------------------------------------------------------
@@ -365,4 +372,4 @@
/* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */
+/* Location: ./system/core/CodeIgniter.php */ \ No newline at end of file