From bce1348820118ea750224c17d81846229dff4852 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 11 Oct 2010 15:37:16 -0500 Subject: Fixed a bug where CI_Model is always loaded in core/Loader.php, regardless of if the class is instantiated or not. --- system/core/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index 292fdc955..316985609 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -177,7 +177,7 @@ class CI_Loader { $CI->load->database($db_conn, FALSE, TRUE); } - if ( ! class_exists('Model')) + if ( ! class_exists('CI_Model')) { load_class('Model', 'core'); } -- cgit v1.2.3-24-g4f1b From c288ea957dd5b01abba96c9644f309a2714482e7 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 11 Oct 2010 15:41:19 -0500 Subject: Fix #120 -- Wording of Cross Site Request Forgery in config.php --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/config.php b/application/config/config.php index 3f2be480f..6422b6437 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -274,7 +274,7 @@ $config['global_xss_filtering'] = FALSE; /* |-------------------------------------------------------------------------- -| Cross Site Forgery Request +| Cross Site Request Forgery |-------------------------------------------------------------------------- | Enables a CSFR cookie token to be set. When set to TRUE, token will be | checked on a submitted form. If you are accepting user data, it is strongly -- cgit v1.2.3-24-g4f1b From ce43396cb7beb49558cd78cf7ef51956a74b8185 Mon Sep 17 00:00:00 2001 From: Greg Aker 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:

  • Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).
  • Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions < 5.1.2.
  • Added a log message in core/output if the cache directory config value was not found.
    • +
  • Fixed a bug where multiple libraries could not be loaded by passing an array to load->library()

    • Version 1.7.2

    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 Once initialized you can use it as indicated in the user guide page corresponding to that class.

    +

    Additionally, multiple libraries can be loaded at the same time by passing an array of libraries to the load function.

    + +$this->load->library(array('email', 'table')); +

    Creating Your Own Libraries

    Please read the section of the user guide that discusses how to create your own libraries

    -- cgit v1.2.3-24-g4f1b