commit a36f637f8c632fc0bb3c0baeea167c48167a1868
author Phil Sturgeon <email@philsturgeon.co.uk> Fri Apr 01 11:40:09 2011 +0100
committer Phil Sturgeon <email@philsturgeon.co.uk> Fri Apr 01 11:40:09 2011 +0100
tree bc8a992c582f62ef063274a47e909f00d5335874
parent a955803ba49ca0b58c3634f800962ca49068ea81
parent 3c6e4851451cd62b02980821cccdd93290463795

Merged changes.

system/core/Loader.php

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 75c0943..5c7a7ef 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -81,7 +81,7 @@
 		{
 			foreach ($library as $read)
 			{
-				$this->library($read);
+				$this->library($class, $params);
 			}
 
 			return;
@@ -97,17 +97,7 @@
 			$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 @@
 }
 
 /* End of file Loader.php */
-/* Location: ./system/core/Loader.php */
\ No newline at end of file
+/* Location: ./system/core/Loader.php */