From 1095d118eb1242091b36c00a2824d0ae7a15c8da Mon Sep 17 00:00:00 2001
From: josephok <josephok@qq.com>
Date: Sat, 16 Nov 2013 09:33:37 +0800
Subject: Update CodeIgniter.php

require(APPPATH.'config/constants.php') should be in front of require(BASEPATH.'core/Common.php') because Common.php uses some constants defined in constants.php.
---
 system/core/CodeIgniter.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'system')

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index c12116236..1981c2649 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -45,14 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  *
  */
 	define('CI_VERSION', '3.0-dev');
-
-/*
- * ------------------------------------------------------
- *  Load the global functions
- * ------------------------------------------------------
- */
-	require_once(BASEPATH.'core/Common.php');
-
+	
 /*
  * ------------------------------------------------------
  *  Load the framework constants
@@ -67,6 +60,13 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		require(APPPATH.'config/constants.php');
 	}
 
+/*
+ * ------------------------------------------------------
+ *  Load the global functions
+ * ------------------------------------------------------
+ */
+	require_once(BASEPATH.'core/Common.php');
+
 /*
  * ------------------------------------------------------
  *  Define a custom error handler so we can log PHP errors
@@ -385,4 +385,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 */
\ No newline at end of file
+/* Location: ./system/core/CodeIgniter.php */
-- 
cgit v1.2.3-24-g4f1b