From ce43396cb7beb49558cd78cf7ef51956a74b8185 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Tue, 12 Oct 2010 09:29:35 -0500
Subject: Fix #83 where multiple libraries could not be loaded at once by
 passing an array to the load->library() function.

---
 system/core/Loader.php            | 10 ++++++++++
 user_guide/changelog.html         |  1 +
 user_guide/general/libraries.html |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 316985609..e64006e93 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -78,6 +78,16 @@ class CI_Loader {
 	 */	
 	function library($library = '', $params = NULL, $object_name = NULL)
 	{
+		if (is_array($library))
+		{
+			foreach($library as $read)
+			{
+				$this->library($read);	
+			}
+			
+			return;
+		}
+		
 		if ($library == '' OR isset($this->_base_classes[$library]))
 		{
 			return FALSE;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 58fd78008..df2820789 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -187,6 +187,7 @@ Hg Tag: </p>
 	<li>Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).</li>
 	<li>Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions &lt; 5.1.2.</li>
 	<li>Added a log message in core/output if the cache directory config value was not found.</li>
+	<li>Fixed a bug where multiple libraries could not be loaded by passing an array to load-&gt;library()</li>
 </ul>
 
 <h2>Version 1.7.2</h2>
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index cd83da741..4d6064fa9 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -69,6 +69,10 @@ In most cases, to use one of these classes involves initializing it within a <a
 
 <p>Once initialized you can use it as indicated in the user guide page corresponding to that class.</p>
 
+<p>Additionally, multiple libraries can be loaded at the same time by passing an array of libraries to the load function.</p>
+
+<code>$this->load->library(array('<var>email</var>', '<var>table</var>'));</code>
+
 <h2>Creating Your Own Libraries</h2>
 
 <p>Please read the section of the user guide that discusses how to <a href="creating_libraries.html">create your own libraries</a></p>
-- 
cgit v1.2.3-24-g4f1b