summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-08 01:58:58 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-08 01:58:58 +0100
commitfd15423734b23ce1f10a24b6fc57f6b16a3b361b (patch)
tree9ddd8afd840f80b48dd3b645eb5b9ec9716b222c /system/libraries
parent1909b5b1dd5e2d6847cbe4a87a0aadd52b506681 (diff)
Fixed bug with rules not being passed to _config_delimiters or back into $this->_config_rules.
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Form_validation.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index f2f3712d9..f3535b225 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -54,7 +54,7 @@ class CI_Form_validation {
$this->CI =& get_instance();
// applies delimiters set in config file.
- $this->_config_delimiters();
+ $rules = $this->_config_delimiters($rules);
// Validation rules can be stored in a config file.
$this->_config_rules = $rules;
@@ -76,9 +76,10 @@ class CI_Form_validation {
/**
* if prefixes/suffixes set in config, assign and unset.
*
- * @return void
+ * @param array
+ * @return array
*/
- protected function _config_delimiters()
+ protected function _config_delimiters($rules)
{
if (isset($rules['error_prefix']))
{
@@ -90,6 +91,7 @@ class CI_Form_validation {
$this->_error_suffix = $rules['error_suffix'];
unset($rules['error_suffix']);
}
+ return $rules;
}
// --------------------------------------------------------------------