diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
| commit | 4a485a73d64a8bebc7625aabc5fdc361d5e7dc56 (patch) | |
| tree | cb18690c4de1c6ca008227260f9dd0cd2b9279d2 /system/core/CodeIgniter.php | |
| parent | 39ec29585b7cdca7edc1a0757c913a13a2ee4f85 (diff) | |
| parent | d444d445ed0458a352ecb9ff79ffd158677ee805 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r-- | system/core/CodeIgniter.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 1c6e76b4f..5ff788ae3 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -249,7 +249,7 @@ if ( ! is_php('5.4')) require_once(BASEPATH.'core/compat/mbstring.php'); require_once(BASEPATH.'core/compat/hash.php'); require_once(BASEPATH.'core/compat/password.php'); - require_once(BASEPATH.'core/compat/array.php'); + require_once(BASEPATH.'core/compat/standard.php'); /* * ------------------------------------------------------ @@ -449,6 +449,23 @@ if ( ! is_php('5.4')) /* * ------------------------------------------------------ + * Should we use a Composer autoloader? + * ------------------------------------------------------ + */ + if (($composer_autoload = config_item('composer_autoload')) !== FALSE) + { + 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? * ------------------------------------------------------ */ |