内核更新

2016-09-26 13:55:47 +08:00
parent 863f6a1cd0
commit 7608d4d0f7
17 changed files with 213 additions and 79 deletions
--- a/core/library/think/model/Merge.php
+++ b/core/library/think/model/Merge.php
@@ -209,7 +209,9 @@ class Merge extends Model
                    // 处理关联模型数据
                    $data  = $this->parseData($name, $this->data);
                    $query = clone $db;
-                    $query->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data);
+                    if ($query->table($table)->strict(false)->where($this->fk, $this->data[$this->getPk()])->update($data)) {
+                        $result = 1;
+                    }
                }
                // 新增回调
                $this->trigger('after_update', $this);