summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-31 19:01:00 +0100
committeradmin <devnull@localhost>2006-10-31 19:01:00 +0100
commit69d3984b0b2ee417c98573185edfd47c3087539b (patch)
treeffa13f1d21c212ab10e2cafaf5e1599841e584fe
parent9139b0c4d57a6052b54838aedb54e70eb683f34c (diff)
-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;