summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-11-17 17:03:59 +0100
committerAndrey Andreev <narf@devilix.net>2013-11-17 17:03:59 +0100
commit8dd404cab980914fd34b0311515831ea0f6f92fc (patch)
tree939e664365571d39d406124d06a8f9c6308d9aa7 /system/core/CodeIgniter.php
parentf696c6d5051b6f7df483676963c76dd17a763b2a (diff)
parent1095d118eb1242091b36c00a2824d0ae7a15c8da (diff)
Merge pull request #2731 from josephok/develop
Update CodeIgniter.php
Diffstat (limited to 'system/core/CodeIgniter.php')
-rw-r--r--system/core/CodeIgniter.php18
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 */