summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-02-24 16:06:28 +0100
committerMike Funk <mfunk@xulonpress.com>2012-02-24 16:06:28 +0100
commit326a5e75db1e03e453f488f2d612b0f421806129 (patch)
tree24d1484a9d3be7dcf666b9abcde55648669cbe31
parentceec45609be0ebc2319e9e21a25eb1642f4eef06 (diff)
added config process method checking for delimiter values, updated changelog and user guide.
-rw-r--r--system/libraries/Form_validation.php24
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/libraries/form_validation.rst8
3 files changed, 32 insertions, 1 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 0a6a2af0d..93ec8b34a 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -55,6 +55,9 @@ class CI_Form_validation {
{
$this->CI =& get_instance();
+ // applies delimiters set in config file.
+ $this->_config_delimiters();
+
// Validation rules can be stored in a config file.
$this->_config_rules = $rules;
@@ -69,6 +72,27 @@ class CI_Form_validation {
log_message('debug', "Form Validation Class Initialized");
}
+
+ // --------------------------------------------------------------------
+
+ /**
+ * if prefixes/suffixes set in config, assign and unset.
+ *
+ * @return void
+ */
+ private function _config_delimiters()
+ {
+ if (isset($rules['error_prefix']))
+ {
+ $this->_error_prefix = $rules['error_prefix']);
+ unset $rules['error_prefix']);
+ }
+ if (isset($rules['error_suffix']))
+ {
+ $this->_error_suffix = $rules['error_suffix']);
+ unset $rules['error_suffix']);
+ }
+ }
// --------------------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..3aa9d6573 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,6 +72,7 @@ Release Date: Not Released
- Minor speed optimizations and method & property visibility declarations in the Calendar Library.
- Removed SHA1 function in the :doc:`Encryption Library <libraries/encryption>`.
- Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library <libraries/security>`, which makes token regeneration optional.
+ - Form Validation library now allows setting of error delimiters in the config file via $config['error_prefix'] and $config['error_suffix'].
- Core
diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst
index e7875bc22..1b3fa61d1 100644
--- a/user_guide_src/source/libraries/form_validation.rst
+++ b/user_guide_src/source/libraries/form_validation.rst
@@ -523,7 +523,7 @@ Changing the Error Delimiters
By default, the Form Validation class adds a paragraph tag (<p>) around
each error message shown. You can either change these delimiters
-globally or individually.
+globally, individually, or change the defaults in a config file.
#. **Changing delimiters Globally**
To globally change the error delimiters, in your controller function,
@@ -543,6 +543,12 @@ globally or individually.
<?php echo validation_errors('<div class="error">', '</div>'); ?>
+#. **Set delimiters in a config file**
+ You can add your error delimiters in application/config/form_validation.php as follows::
+
+ $config['error_prefix'] = '<p class="error_prefix">';
+ $config['error_suffix'] = '<p class="error_suffix">';
+
Showing Errors Individually
===========================