From 9056b564b6c02e8e5246d94685e84d333641a009 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:42:33 +0000 Subject: Allowed empty rules to be set, and fixed a bug that allows blank error messages to output the delimiters. --- system/libraries/Form_validation.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'system') diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index b658011bd..e8ba4e0df 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -96,8 +96,8 @@ class CI_Form_validation { return; } - // No rules or fields? Nothing to do... - if ( ! is_string($field) OR ! is_string($rules) OR $field == '' OR $rules == '') + // No fields? Nothing to do... + if ( ! is_string($field) OR ! is_string($rules) OR $field == '') { return; } @@ -197,7 +197,7 @@ class CI_Form_validation { */ function error($field = '', $prefix = '', $suffix = '') { - if ( ! isset($this->_field_data[$field]['error'])) + if ( ! isset($this->_field_data[$field]['error']) OR $this->_field_data[$field]['error'] == '') { return ''; } @@ -249,7 +249,10 @@ class CI_Form_validation { $str = ''; foreach ($this->_error_array as $val) { - $str .= $prefix.$val.$suffix."\n"; + if ($val != '') + { + $str .= $prefix.$val.$suffix."\n"; + } } return $str; -- cgit v1.2.3-24-g4f1b