summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2007-10-16 15:10:02 +0200
committerDerek Allard <derek.allard@ellislab.com>2007-10-16 15:10:02 +0200
commit3f9e557ed1e5b9d0ea14bba201058b3877a96da8 (patch)
treebf1b824d2f7623c473e6af173a34ebfa1fb67710 /system
parentdb43858f537722deef7c9ebc903534ea9be0df60 (diff)
Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Validation.php4
1 files changed, 2 insertions, 2 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);
}
// --------------------------------------------------------------------