diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2010-10-12 16:33:10 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2010-10-12 16:33:10 +0200 |
| commit | e4054b8e62bf8dcbfbc689752a6e952fe1aa1be0 (patch) | |
| tree | 3676937c28bde64a98917c44dbe35530243963fc | |
| parent | 3a082fd3d6cb2e72612d51b9d8e54e93effb93eb (diff) | |
| parent | ce43396cb7beb49558cd78cf7ef51956a74b8185 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter2
| -rw-r--r-- | system/core/Loader.php | 12 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 | ||||
| -rw-r--r-- | user_guide/general/libraries.html | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 69b3da0c9..5a2175c2d 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; @@ -177,7 +187,7 @@ class CI_Loader { $CI->load->database($db_conn, FALSE, TRUE); } - if ( ! class_exists('Model')) + if ( ! class_exists('CI_Model')) { load_class('Model', 'core'); } 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 < 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->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> |