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

修正

Browse Source
This commit is contained in:
thinkphp
2017-10-27 13:34:55 +08:00
parent f85f897070
commit d6118aa53e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Validate.php
View File

@@ -847,11 +847,7 @@ class Validate
} }
$pk = strval(isset($rule[3]) ? $rule[3] : $db->getPk()); $pk = strval(isset($rule[3]) ? $rule[3] : $db->getPk());
if(is_array($pk)){ if (isset($rule[2])) {
foreach($pk as $key){
$map[$key] = ['neq',]
}
}elseif (isset($rule[2])) {
$map[$pk] = ['neq', $rule[2]]; $map[$pk] = ['neq', $rule[2]];
} elseif (isset($data[$pk])) { } elseif (isset($data[$pk])) {
$map[$pk] = ['neq', $data[$pk]]; $map[$pk] = ['neq', $data[$pk]];
@@ -1242,7 +1238,7 @@ class Validate
if (is_string($msg) && 0 === strpos($msg, '{%')) { if (is_string($msg) && 0 === strpos($msg, '{%')) {
$msg = Lang::get(substr($msg, 2, -1)); $msg = Lang::get(substr($msg, 2, -1));
}elseif(Lang::has($msg)){ } elseif (Lang::has($msg)) {
$msg = Lang::get($msg); $msg = Lang::get($msg);
} }