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

改进自动验证和自动填充 callback方式支持传入第二个参数data（引用传值）

Browse Source
This commit is contained in:
thinkphp
2016-02-09 17:38:24 +08:00
parent c54de3ea8e
commit efabc44164
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -1014,7 +1014,7 @@ class Model
Hook::exec($rule, '', $data);
break;
case 'callback':
$data[$key] = call_user_func_array($rule, [$value]);
$data[$key] = call_user_func_array($rule, [$value, &$data]);
break;
case 'ignore':
if ($rule === $value) {
@@ -1046,7 +1046,7 @@ class Model
$options = isset($val[3]) ? $val[3] : [];
switch ($type) {
case 'callback':
$result = call_user_func_array($rule, [$value]);
$result = call_user_func_array($rule, [$value, &$data]);
break;
case 'behavior':
$result = Hook::exec($rule, '', $data);
@@ -1072,9 +1072,7 @@ class Model
break;
case 'regex':
default:
if (isset($options['rule'])) {
$rule = $options['rule'];
} elseif (isset($this->rule[$rule])) {
if (isset($this->rule[$rule])) {
$rule = $this->rule[$rule];
}
$result = 1 === preg_match('/^' . $rule . '$/', (string) $value);