1、更新内核

2、代码格式化
2016-07-21 14:29:32 +08:00
parent 3cc2c38dc7
commit a72ba86faa
20 changed files with 1214 additions and 1083 deletions
--- a/core/library/think/Model.php
+++ b/core/library/think/Model.php
@@ -756,7 +756,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                $value = null;
            }
            if (!in_array($field, $this->change)) {
-                $this->setAttr($field, isset($this->data[$field]) ? $this->data[$field] : $value);
+                $this->setAttr($field, !is_null($value) ? $value : (isset($this->data[$field]) ? $this->data[$field] : $value));
            }
        }
    }