From 2eb580cff726160f737da2e36ebae7e60d676e30 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 30 Jan 2015 16:41:43 +0200 Subject: Log an error message if composer_autoload is not found. --- system/core/CodeIgniter.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'system/core/CodeIgniter.php') diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 839caba08..d830c1829 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -164,14 +164,20 @@ if ( ! is_php('5.4')) */ if ($composer_autoload = config_item('composer_autoload')) { - if ($composer_autoload === TRUE && file_exists(APPPATH.'vendor/autoload.php')) + if ($composer_autoload === TRUE) { - require_once(APPPATH.'vendor/autoload.php'); + file_exists(APPPATH.'vendor/autoload.php') + ? require_once(APPPATH.'vendor/autoload.php') + : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.'); } elseif (file_exists($composer_autoload)) { require_once($composer_autoload); } + else + { + log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload); + } } /* -- cgit v1.2.3-24-g4f1b