diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index e2467fa..a140fb5 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -565,15 +565,7 @@
{
if (isset($autoload[$type]))
{
- if ( ! is_array($autoload[$type]))
- {
- $autoload[$type] = array($autoload[$type]);
- }
-
- foreach ($autoload[$type] as $item)
- {
- $this->$type($item);
- }
+ $this->$type($autoload[$type]);
}
}
}
@@ -592,20 +584,9 @@
*/
function _ci_object_to_array($object)
{
- if ( ! is_object($object))
- {
- return $object;
- }
-
- $array = array();
- foreach (get_object_vars($object) as $key => $val)
- {
- $array[$key] = $val;
- }
-
- return $array;
+ return (is_object($object)) ? get_object_vars($object) : $object;
}
+ // END _ci_object_to_array()
}
-// END Loader Class
?>
\ No newline at end of file