修正验证类的ip验证规则

This commit is contained in:
thinkphp
2017-02-05 12:30:46 +08:00
parent fcfe91a97d
commit 113616fa0f

View File

@@ -656,7 +656,7 @@ class Validate
if (!in_array($rule, ['ipv4', 'ipv6'])) { if (!in_array($rule, ['ipv4', 'ipv6'])) {
$rule = 'ipv4'; $rule = 'ipv4';
} }
return $this->filter($value, FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4); return $this->filter($value, [FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4]);
} }
/** /**
@@ -872,6 +872,7 @@ class Validate
list($rule, $param) = explode(',', $rule); list($rule, $param) = explode(',', $rule);
} elseif (is_array($rule)) { } elseif (is_array($rule)) {
$param = isset($rule[1]) ? $rule[1] : null; $param = isset($rule[1]) ? $rule[1] : null;
$rule = $rule[0];
} else { } else {
$param = null; $param = null;
} }