summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-11-17 17:06:18 +0100
committerAndrey Andreev <narf@devilix.net>2013-11-17 17:06:18 +0100
commitb6fbcbefc8e6e883773f8f5d447413c367da9aaa (patch)
treedaa7cddd001af4f8f42b49e7c08fb2597088479b
parent8dd404cab980914fd34b0311515831ea0f6f92fc (diff)
Always load application/config/constants.php
-rw-r--r--system/core/CodeIgniter.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 1981c2649..45c3485bf 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -45,7 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*
*/
define('CI_VERSION', '3.0-dev');
-
+
/*
* ------------------------------------------------------
* Load the framework constants
@@ -55,10 +55,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{
require(APPPATH.'config/'.ENVIRONMENT.'/constants.php');
}
- else
- {
- require(APPPATH.'config/constants.php');
- }
+
+ require(APPPATH.'config/constants.php');
/*
* ------------------------------------------------------
@@ -385,4 +383,4 @@ defined('BASEPATH') OR exit('No direct script access allowed');
$EXT->call_hook('post_system');
/* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */
+/* Location: ./system/core/CodeIgniter.php */ \ No newline at end of file