summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-22 15:41:25 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-22 15:41:25 +0100
commitbd6a814e66643a622ff535664c608b2939af299d (patch)
treec3065dbd5b0452240bb76617154ae51f1501d400 /system/core
parent21898a45f323bb74ef6e5ee8cf21c3397467665b (diff)
Don't try to include config/autoload.php if it doesn't exist
Related: #3497
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 6371ca3c7..20b26d80f 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1232,7 +1232,11 @@ class CI_Loader {
*/
protected function _ci_autoloader()
{
- include(APPPATH.'config/autoload.php');
+ if (file_exists(APPPATH.'config/config.php'))
+ {
+ include(APPPATH.'config/autoload.php');
+ }
+
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
{
include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');