diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-19 13:31:53 +0100 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-19 13:31:53 +0100 |
commit | 0b175df60309f142249266720940fa2b3d7ccad7 (patch) | |
tree | 38dfff0d751d8eb02a305cbe6b7b8f68047f6f86 /system/libraries | |
parent | fea45ad97f9f32738ed7ccc25bdb0405b6f6572f (diff) | |
parent | c3828718925a0f1660cddadc95b63e14f7189faa (diff) |
Automated merge with https://bitbucket.org/dhorrigan/codeigniter-reactor
Diffstat (limited to 'system/libraries')
-rw-r--r-- | system/libraries/Form_validation.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index f45760024..9fe76b5f2 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -171,7 +171,7 @@ class CI_Form_validation { } $this->_error_messages = array_merge($this->_error_messages, $lang); - + return $this; } @@ -191,7 +191,7 @@ class CI_Form_validation { { $this->_error_prefix = $prefix; $this->_error_suffix = $suffix; - + return $this; } @@ -339,13 +339,7 @@ class CI_Form_validation { } } - preg_match_all('/([a-zA-Z_-]*(\[.*\])?)\|?/i', $row['rules'], $matches); - - $rules = $matches[1]; - array_pop($rules); - unset($matches); - - $this->_execute($row, $rules, $this->_field_data[$field]['postdata']); + $this->_execute($row, explode('|', $row['rules']), $this->_field_data[$field]['postdata']); } // Did we end up with any errors? @@ -742,7 +736,7 @@ class CI_Form_validation { { return array_shift($this->_field_data[$field]['postdata']); } - + return $this->_field_data[$field]['postdata']; } |