diff options
| author | Tom Klingenberg <tklingenberg@lastflood.net> | 2011-10-07 20:03:30 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-10-27 00:57:06 +0200 |
| commit | e8349294d8638dac1e689d137188bb7c7c7c19c5 (patch) | |
| tree | 47cb7c2175ef650cd6de6e5176b7834d1a1cdd5a /system/core | |
| parent | 6cf88be7b6b7b9f90241456aa5f11aba93e2478d (diff) | |
CI_Loader::driver() processes empty library. Fixed.
This causes endless recursion calls _ci_load_class(), see #550
Diffstat (limited to 'system/core')
| -rw-r--r--[-rwxr-xr-x] | system/core/Loader.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index e7fa3d3f6..6b7ee0c28 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, '/')) |