summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorTom Klingenberg <tklingenberg@lastflood.net>2011-10-07 20:03:30 +0200
committerTom Klingenberg <tklingenberg@lastflood.net>2011-10-07 20:03:30 +0200
commit6a15b2d8e84b38e1a42d7c27ae2f6ed393e72399 (patch)
tree6dbf0a23a73632d0e4752a8571a9bba59f238f82 /system
parent6858c0753a7221796d6a5a1d7fea93cc2f9feb2e (diff)
CI_Loader::driver() processes empty library. Fixed.
This causes endless recursion calls _ci_load_class(), see #550
Diffstat (limited to 'system')
-rw-r--r--[-rwxr-xr-x]system/core/Loader.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index de0fc06d2..5539aae14 100755..100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -616,6 +616,11 @@ class CI_Loader {
require BASEPATH.'libraries/Driver.php';
}
+ if ($library == '')
+ {
+ return FALSE;
+ }
+
// We can save the loader some time since Drivers will *always* be in a subfolder,
// and typically identically named to the library
if ( ! strpos($library, '/'))