summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-09-10 12:07:35 +0200
committerAndrey Andreev <narf@devilix.net>2015-09-10 12:07:35 +0200
commit7fe749991bc3782f3c836bd2dce9283e55c67130 (patch)
treebf98b23990d9ae86736368122bca898da9c1f1a8
parent3f67b256aa567ac96fc39f409c889670f1ce6325 (diff)
parent2b2962f1efbdf243b70688690de3f09f9564ad05 (diff)
Merge pull request #4105 from rjbrooksjr/develop
FV library to allow the pipe character within brackets
-rw-r--r--system/libraries/Form_validation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index d9ecc45f9..af90316a4 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -211,7 +211,7 @@ class CI_Form_validation {
return $this;
}
- $rules = explode('|', $rules);
+ $rules = preg_split('/\|(?![^\[]*\])/', $rules);
}
// If the field label wasn't passed we use the field name