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

修正事务

Browse Source
This commit is contained in:
thinkphp
2016-05-11 22:09:55 +08:00
parent cbd8ea477d
commit ee837df7c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Model.php
View File

@@ -400,7 +400,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = null;
}
if (!in_array($field, $this->change)) {
if(in_array($field, $this->autoTimeField)) {
if (in_array($field, $this->autoTimeField)) {
$this->__set($field, $value);
} else {
$this->__set($field, isset($this->data[$field]) ? $this->data[$field] : $value);
@@ -867,7 +867,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (!isset(self::$links[$model])) {
$class = new static;
self::$links[$model] = Db::connect($class->connection, $model);
self::$links[$model] = Db::connect($class->connection);
self::$instance[$model] = $class;
} else {
$class = self::$instance[$model];