summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-10-12 16:33:10 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-10-12 16:33:10 +0200
commite4054b8e62bf8dcbfbc689752a6e952fe1aa1be0 (patch)
tree3676937c28bde64a98917c44dbe35530243963fc /user_guide
parent3a082fd3d6cb2e72612d51b9d8e54e93effb93eb (diff)
parentce43396cb7beb49558cd78cf7ef51956a74b8185 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html1
-rw-r--r--user_guide/general/libraries.html4
2 files changed, 5 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 8c052572a..5bfbee702 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -188,6 +188,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>