Fixed multi-driver load return and last-ditch library subdirectory retry object names
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 01d99dd..0d05649 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -633,7 +633,7 @@
{
$this->driver($driver);
}
- return FALSE;
+ return;
}
if ($library === '')
@@ -1003,13 +1003,13 @@
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.