diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-05-12 18:17:58 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-12 18:17:58 +0200 |
| commit | d56743b0d65603ebd556a05f740d5bd5da05101b (patch) | |
| tree | 594e52f680b78d7c62c6e1e317d19da07e21073e | |
| parent | d36ade01b57ac39c328d9e0278b28b04fbef895e (diff) | |
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/
| -rw-r--r-- | system/libraries/Validation.php | 6 | ||||
| -rw-r--r-- | 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</p> <li>Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.</li>
<li>Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.</li>
<li>Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.</li>
+ <li>Fixed an array to string conversion error in the Validation library (#4425)</li>
<li>Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency</li>
</ul>
|