summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-10-19 00:03:36 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-10-19 00:03:36 +0200
commit825e9709a02840696dc1cbb6b2ca58590fc06bf1 (patch)
tree0f6aa18a9b8fe40a153841667c5a138f57499039
parent30cc1beb26f9d634f1db36e092bb568eb7bb7cc7 (diff)
parent6a15b2d8e84b38e1a42d7c27ae2f6ed393e72399 (diff)
Merge pull request #594 from ktomk/patch-8
CI_Loader::driver() processes empty library. Fixed.
-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, '/'))