diff options
| author | josephok <josephok@qq.com> | 2013-11-16 02:33:37 +0100 |
|---|---|---|
| committer | josephok <josephok@qq.com> | 2013-11-16 02:33:37 +0100 |
| commit | 1095d118eb1242091b36c00a2824d0ae7a15c8da (patch) | |
| tree | a5a67e33abc1c6c5f3c32bdf56f33227b5ff2995 /system/core | |
| parent | afca352b30466ecff38dc3106321851a030af623 (diff) | |
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.
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/CodeIgniter.php | 18 |
1 files changed, 9 insertions, 9 deletions
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 @@ -69,6 +62,13 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* * ------------------------------------------------------ + * 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 */ |