From b6fbcbefc8e6e883773f8f5d447413c367da9aaa Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sun, 17 Nov 2013 18:06:18 +0200 Subject: Always load application/config/constants.php --- system/core/CodeIgniter.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'system') 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 -- cgit v1.2.3-24-g4f1b