summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-09-20 23:13:26 +0200
committeradmin <devnull@localhost>2006-09-20 23:13:26 +0200
commite348efb92de213fcfbc312993d8b21a30eb280c0 (patch)
treec9e8f65a883208448c01813eb300277f9773030c /system/libraries
parent480da81d6111a5c1faf4433707ee8d3b3de8031e (diff)
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Validation.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 227cf9f9a..065e7a2d5 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -246,8 +246,8 @@ class CI_Validation {
{
$rule = substr($rule, 9);
$callback = TRUE;
- }
-
+ }
+
// Strip the parameter (if exists) from the rule
// Rules can contain a parameter: max_length[5]
$param = FALSE;
@@ -265,13 +265,14 @@ class CI_Validation {
continue;
}
- $result = $this->obj->$rule($_POST[$field], $param);
+ $result = $this->obj->$rule($_POST[$field], $param);
- // If the field isn't requires we'll move on...
- if ( ! in_array('required', $ex))
+ // If the field isn't required and we just processed a callback we'll move on...
+ if ( ! in_array('required', $ex) AND $result !== FALSE)
{
- continue;
+ continue 2;
}
+
}
else
{
@@ -295,7 +296,7 @@ class CI_Validation {
$result = $this->$rule($_POST[$field], $param);
}
-
+
// Did the rule test negatively? If so, grab the error.
if ($result === FALSE)
{
@@ -323,8 +324,9 @@ class CI_Validation {
// Add the error to the error array
$this->_error_array[] = $message;
continue 2;
- }
+ }
}
+
}
$total_errors = count($this->_error_array);