summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authordchill42 <dchill42@gmail.com>2012-08-28 02:54:23 +0200
committerdchill42 <dchill42@gmail.com>2012-08-28 02:54:23 +0200
commit0fc3be559d23fda6ab112c01b0cd9156f201af85 (patch)
treecf2b3d29033f4d603ad7188a2334f3debed2a5bd /system/core/Loader.php
parent62ece3359211482dc5671b9521454608ad226840 (diff)
Fixed multi-driver load return and last-ditch library subdirectory retry object names
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 01d99dd37..0d05649ca 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -633,7 +633,7 @@ class CI_Loader {
{
$this->driver($driver);
}
- return FALSE;
+ return;
}
if ($library === '')
@@ -1003,13 +1003,13 @@ class CI_Loader {
if ($subdir === '')
{
$path = strtolower($class).'/'.$class;
- return $this->_ci_load_class($path, $params);
+ return $this->_ci_load_class($path, $params, $object_name);
}
else if (ucfirst($subdir) != $subdir)
{
// Lowercase subdir failed - retry capitalized
$path = ucfirst($subdir).$class;
- return $this->_ci_load_class($path, $params);
+ return $this->_ci_load_class($path, $params, $object_name);
}
// If we got this far we were unable to find the requested class.