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

修正错误

Browse Source
This commit is contained in:
thinkphp
2016-02-15 22:48:10 +08:00
parent 814515cefd
commit 2eb103f5cb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/Model.php
View File

@@ -1090,7 +1090,7 @@ class Model
$value = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null; $value = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;
} else { } else {
$value = isset($data[$key]) ? $data[$key] : null; $value = isset($data[$key]) ? $data[$key] : null;
} }
if ($val instanceof \Closure) { if ($val instanceof \Closure) {
$result = App::invokeFunction($val, [$value, $data]); $result = App::invokeFunction($val, [$value, $data]);
} else { } else {
@@ -1112,7 +1112,11 @@ class Model
break; break;
case 'ignore': case 'ignore':
if ($rule === $value) { if ($rule === $value) {
unset(strpos($key,'.')?$data[$name1][$name2]:$data[$key]); if (strpos($key, '.')) {
unset($data[$name1][$name2]);
} else {
unset($data[$key]);
}
} }
return; return;
case 'value': case 'value':
@@ -1121,9 +1125,9 @@ class Model
break; break;
} }
} }
if(strpos($key,'.')){ if (strpos($key, '.')) {
$data[$name1][$name2] = $result; $data[$name1][$name2] = $result;
}else{ } else {
$data[$key] = $result; $data[$key] = $result;
} }
} }