Merge branch 'master' into 2.6

This commit is contained in:
mark_story 2014-07-09 10:17:05 -04:00
commit 3a70d9c033
12 changed files with 138 additions and 29 deletions

View file

@ -814,14 +814,13 @@ class Validation {
* @return bool Success.
*/
public static function inList($check, $list, $caseInsensitive = false) {
$strict = !is_numeric($check);
if ($caseInsensitive) {
$list = array_map('mb_strtolower', $list);
$check = mb_strtolower($check);
} else {
$list = array_map('strval', $list);
}
return in_array((string)$check, $list, $strict);
return in_array((string)$check, $list, true);
}
/**