diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-06 02:01:36 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-06 02:01:36 +0200 |
| commit | 6612b6728084e5ca85bdd5f4183769946b1ae713 (patch) | |
| tree | 3e7559fd03e759e6cf7808d9f281326bac057fa6 /system | |
| parent | 41b546deee9f1ed99f3820de5a2014b2d74a0c94 (diff) | |
| parent | 286f9e1ae17188562d5f42c197709b547b90596e (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/CodeIgniter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 5ff788ae3..10d599c98 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -452,7 +452,7 @@ if ( ! is_php('5.4')) * Should we use a Composer autoloader? * ------------------------------------------------------ */ - if (($composer_autoload = config_item('composer_autoload')) !== FALSE) + if ($composer_autoload = config_item('composer_autoload')) { if ($composer_autoload === TRUE && file_exists(APPPATH.'vendor/autoload.php')) { |