From 3f9e557ed1e5b9d0ea14bba201058b3877a96da8 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Tue, 16 Oct 2007 13:10:02 +0000
Subject: Changed the behaviour of custom callbacks so that they no longer
 trigger the "required" rule.

---
 system/libraries/Validation.php | 4 ++--
 user_guide/changelog.html       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 33753bc72..575c5262e 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -195,7 +195,7 @@ class CI_Validation {
 			$ex = explode('|', $rules);
 
 			// Is the field required?  If not, if the field is blank  we'll move on to the next test
-			if ( ! in_array('required', $ex, TRUE) AND strpos($rules, 'callback_') === FALSE)
+			if ( ! in_array('required', $ex, TRUE))
 			{
 				if ( ! isset($_POST[$field]) OR $_POST[$field] == '')
 				{
@@ -546,7 +546,7 @@ class CI_Validation {
 	 */	
 	function numeric($str)
 	{
-		return ( ! ereg("^[0-9\.]+$", $str)) ? FALSE : TRUE;
+		return ! preg_match('/[^0-9]/', $str);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d9819d4f3..69e461421 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -76,7 +76,8 @@ Change Log
     <li>Added a check for NULL fields in the MySQL database backup utility.</li>
     <li>Documented the timezones() function in the <a href="./helpers/date_helper.html">Date Helper</a>.</li>
     <li>Documented unset_userdata in the <a href="./libraries/sessions.html">Session class</a>.</li>
-    <li>Fixed a bug in <a href="./libraries/validation.html">Validation</a> where valid_ip() wasn't called properly</li>
+    <li>Changed the behaviour of custom callbacks so that they no longer trigger the &quot;required&quot; rule. </li>
+    <li>Fixed a bug in <a href="./libraries/validation.html">Validation</a> where valid_ip() wasn't called properly.</li>
     <li>Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space. </li>
     <li>Fixed a bug in database driver where num_rows property wasn't getting updated.</li>
     <li>Fixed a bug in captcha calling an invalid PHP function.</li>
-- 
cgit v1.2.3-24-g4f1b