summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-19 11:30:32 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-19 11:30:32 +0200
commita0c6a2486ec91d78fa54e18fee7a0c69dff0c151 (patch)
tree4e2b95e034f9ccc5c790e97a2c85c013ef62c3e3 /system/core
parent62fa21a2fe049bdfba77d16533f1f79710044b58 (diff)
parent23af23e52eb3c7dd4f4261f833b40c2242d2504b (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core')
-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, '/'))