summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-04-01 12:40:09 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-04-01 12:40:09 +0200
commita36f637f8c632fc0bb3c0baeea167c48167a1868 (patch)
treebc8a992c582f62ef063274a47e909f00d5335874 /system/core/Loader.php
parenta955803ba49ca0b58c3634f800962ca49068ea81 (diff)
parent3c6e4851451cd62b02980821cccdd93290463795 (diff)
Merged changes.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php16
1 files changed, 3 insertions, 13 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 75c09435d..5c7a7eff8 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -81,7 +81,7 @@ class CI_Loader {
{
foreach ($library as $read)
{
- $this->library($read);
+ $this->library($class, $params);
}
return;
@@ -97,17 +97,7 @@ class CI_Loader {
$params = NULL;
}
- if (is_array($library))
- {
- foreach ($library as $class)
- {
- $this->_ci_load_class($class, $params, $object_name);
- }
- }
- else
- {
- $this->_ci_load_class($library, $params, $object_name);
- }
+ $this->_ci_load_class($library, $params, $object_name);
}
// --------------------------------------------------------------------
@@ -1111,4 +1101,4 @@ class CI_Loader {
}
/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */ \ No newline at end of file
+/* Location: ./system/core/Loader.php */