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

修正Validate类

Browse Source
This commit is contained in:
thinkphp
2016-04-10 23:18:45 +08:00
parent 32ba255de9
commit 6acd1470ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Validate.php
View File

@@ -602,7 +602,7 @@ class Validate
if (is_string($rule)) { if (is_string($rule)) {
$rule = explode(',', $rule); $rule = explode(',', $rule);
} }
$model = Loader::table($rule[0]); $db = Db::table($rule[0]);
$field = isset($rule[1]) ? $rule[1] : $field; $field = isset($rule[1]) ? $rule[1] : $field;
if (strpos($field, '^')) { if (strpos($field, '^')) {
@@ -617,14 +617,14 @@ class Validate
$map[$field] = $data[$field]; $map[$field] = $data[$field];
} }
$key = strval(isset($rule[3]) ? $rule[3] : $model->getPk()); $key = strval(isset($rule[3]) ? $rule[3] : 'id');
if (isset($rule[2])) { if (isset($rule[2])) {
$map[$key] = ['neq', $rule[2]]; $map[$key] = ['neq', $rule[2]];
} elseif (isset($data[$key])) { } elseif (isset($data[$key])) {
$map[$key] = ['neq', $data[$key]]; $map[$key] = ['neq', $data[$key]];
} }
if ($model->where($map)->field($key)->find()) { if ($db->where($map)->field($key)->find()) {
return false; return false;
} }
return true; return true;