mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Validate类

Browse Source
This commit is contained in:
thinkphp
2016-03-06 21:01:31 +08:00
parent 763a3f0c41
commit d5870ddb59
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Error.php
View File

@@ -141,7 +141,7 @@ class Error
*/ */
public static function output($exception, array $vars) public static function output($exception, array $vars)
{ {
http_response_code($exception instanceof \think\Exception ? $exception->getHttpStatus() : 500); http_response_code($exception instanceof Exception ? $exception->getHttpStatus() : 500);
$type = Config::get('default_return_type'); $type = Config::get('default_return_type');

5
library/think/Validate.php
View File

@@ -337,8 +337,7 @@ class Validate
*/ */
public static function filter($value, $rule, $params = []) public static function filter($value, $rule, $params = [])
{ {
$result = filter_var($value, is_int($rule) ? $rule : filter_id($rule), $params); return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $params);
return false === $result ? false : true;
} }
/** /**
@@ -464,7 +463,7 @@ class Validate
} else { } else {
$name = $rules; $name = $rules;
} }
$rules = $config[$name]; $rules = isset($config[$name]) ? $config[$name] : [];
if (isset($config['__all__'])) { if (isset($config['__all__'])) {
$rules = array_merge($config['__all__'], $rules); $rules = array_merge($config['__all__'], $rules);
} }