summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-09-29 11:30:55 +0200
committerAndrey Andreev <narf@devilix.net>2015-09-29 11:32:07 +0200
commite837851d3626617ff9f8311c45d26449167d5fa8 (patch)
treea10c8fd4a6ea4120789fe0fa58ce30fb31dcda5b
parent7f5c7533312d38ea922e6068cd097bf694fa3907 (diff)
Merge pull request #4126 from zoaked/patch-1
Persist config file rules when using FV reset_validation()
-rw-r--r--system/libraries/Form_validation.php1
-rw-r--r--user_guide_src/source/libraries/form_validation.rst2
2 files changed, 1 insertions, 2 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index af90316a4..a158225ee 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1586,7 +1586,6 @@ class CI_Form_validation {
public function reset_validation()
{
$this->_field_data = array();
- $this->_config_rules = array();
$this->_error_array = array();
$this->_error_messages = array();
$this->error_string = '';
diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst
index 1fde68d73..c288cc8c0 100644
--- a/user_guide_src/source/libraries/form_validation.rst
+++ b/user_guide_src/source/libraries/form_validation.rst
@@ -1140,4 +1140,4 @@ the following functions:
- :php:func:`set_radio()`
Note that these are procedural functions, so they **do not** require you
-to prepend them with ``$this->form_validation``. \ No newline at end of file
+to prepend them with ``$this->form_validation``.