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/
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 8796d7f..a0f038c 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -726,6 +726,8 @@
{
$data[$key] = $this->prep_for_form($val);
}
+
+ return $data;
}
if ($this->_safe_form_data == FALSE OR $data == '')
@@ -805,6 +807,6 @@
}
// 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 8c94d46..e08b715 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -141,6 +141,7 @@
<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>