summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Loader.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index aa1ae8cb4..5db9886b4 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -686,11 +686,16 @@ class CI_Loader {
for ($i = 1; $i < 3; $i++)
{
$path = ($i % 2) ? APPPATH : BASEPATH;
-
$fp = $path.'libraries/'.$class.EXT;
+ // Does the file exist? No? Bummer...
+ if ( ! file_exists($fp))
+ {
+ continue;
+ }
+
// Safety: Was the class already loaded by a previous call?
- if (in_array($fp, $this->_ci_classes) OR ! file_exists($fp))
+ if (in_array($fp, $this->_ci_classes))
{
$is_duplicate = TRUE;
continue;