summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeesung Ahn <ahn.heesung@gmail.com>2015-03-10 00:32:56 +0100
committerHeesung Ahn <ahn.heesung@gmail.com>2015-03-10 00:32:56 +0100
commit22ade0ddd55fe76a39be529eab05fff3209170da (patch)
tree8360409552d2c9feeeb7fb3e59a3e956faec03ca
parentc7533fc1b25eda818b371967be97a26e275e55c5 (diff)
parentafc20169146e4a6431f5aba9c980072964807721 (diff)
Merge origin/develop into CI_Security_Unit_Test
-rw-r--r--system/libraries/Form_validation.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index f161b40e7..9d1660258 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1151,9 +1151,7 @@ class CI_Form_validation {
return FALSE;
}
- return (MB_ENABLED === TRUE)
- ? ($val <= mb_strlen($str))
- : ($val <= strlen($str));
+ return ($val <= mb_strlen($str));
}
// --------------------------------------------------------------------
@@ -1172,9 +1170,7 @@ class CI_Form_validation {
return FALSE;
}
- return (MB_ENABLED === TRUE)
- ? ($val >= mb_strlen($str))
- : ($val >= strlen($str));
+ return ($val >= mb_strlen($str));
}
// --------------------------------------------------------------------
@@ -1193,9 +1189,7 @@ class CI_Form_validation {
return FALSE;
}
- return (MB_ENABLED === TRUE)
- ? (mb_strlen($str) === (int) $val)
- : (strlen($str) === (int) $val);
+ return (mb_strlen($str) === (int) $val);
}
// --------------------------------------------------------------------