summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-30 14:53:28 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-30 14:53:28 +0100
commit17254324f9887c5fa511b94a3b17c8c4d82b2c8f (patch)
treec29ec85517738ce3d034db71c1e64b760ccf4b08 /system/core/CodeIgniter.php
parentcc6c9a4a594ab1c3167a11dc90c7749278d8e131 (diff)
[ci skip] Load vendor/autoload.php earlier
Diffstat (limited to 'system/core/CodeIgniter.php')
-rw-r--r--system/core/CodeIgniter.php34
1 files changed, 17 insertions, 17 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 8c936e018..839caba08 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -159,6 +159,23 @@ if ( ! is_php('5.4'))
/*
* ------------------------------------------------------
+ * Should we use a Composer autoloader?
+ * ------------------------------------------------------
+ */
+ if ($composer_autoload = config_item('composer_autoload'))
+ {
+ if ($composer_autoload === TRUE && file_exists(APPPATH.'vendor/autoload.php'))
+ {
+ require_once(APPPATH.'vendor/autoload.php');
+ }
+ elseif (file_exists($composer_autoload))
+ {
+ require_once($composer_autoload);
+ }
+ }
+
+/*
+ * ------------------------------------------------------
* Start the timer... tick tock tick tock...
* ------------------------------------------------------
*/
@@ -461,23 +478,6 @@ if ( ! is_php('5.4'))
/*
* ------------------------------------------------------
- * Should we use a Composer autoloader?
- * ------------------------------------------------------
- */
- if ($composer_autoload = config_item('composer_autoload'))
- {
- if ($composer_autoload === TRUE && file_exists(APPPATH.'vendor/autoload.php'))
- {
- require_once(APPPATH.'vendor/autoload.php');
- }
- elseif (file_exists($composer_autoload))
- {
- require_once($composer_autoload);
- }
- }
-
-/*
- * ------------------------------------------------------
* Is there a "pre_controller" hook?
* ------------------------------------------------------
*/