From d56743b0d65603ebd556a05f740d5bd5da05101b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 12 May 2008 16:17:58 +0000 Subject: fixed a bug that would lead to a PHP notice error of array to string conversion in prep_for_form() http://codeigniter.com/bug_tracker/bug/4425/ --- system/libraries/Validation.php | 6 ++++-- user_guide/changelog.html | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 8796d7ffb..a0f038c02 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -726,6 +726,8 @@ class CI_Validation { { $data[$key] = $this->prep_for_form($val); } + + return $data; } if ($this->_safe_form_data == FALSE OR $data == '') @@ -805,6 +807,6 @@ class CI_Validation { } // END Validation Class - -/* End of file Validation.php */ + +/* End of file Validation.php */ /* Location: ./system/libraries/Validation.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8c94d4689..e08b715f2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -141,6 +141,7 @@ SVN Commit: not currently released

  • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
  • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
  • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
    • +
  • Fixed an array to string conversion error in the Validation library (#4425)
  • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
    • -- cgit v1.2.3-24-g4f1b