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

修正allowfield方法影响时间字段写入的问题

Browse Source
This commit is contained in:
thinkphp
2017-07-05 13:49:20 +08:00
parent ac7dbafab2
commit 094dde5d8d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Model.php
View File

@@ -1099,6 +1099,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$field = $this->field; $field = $this->field;
} elseif (!empty($this->field)) { } elseif (!empty($this->field)) {
$field = array_merge($this->field, $auto); $field = array_merge($this->field, $auto);
if ($this->autoWriteTimestamp) {
array_push($field, $this->createTime, $this->updateTime);
}
} else { } else {
$field = []; $field = [];
} }