molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新内核，删除部分不常用驱动

Browse Source
This commit is contained in:
molong
2016-07-16 20:07:06 +08:00
parent 87533013c6
commit 152f8bf165
13 changed files with 20 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/library/think/model/Relation.php
View File

@@ -640,14 +640,16 @@ class Relation
$id = $data->$relationFk;
}
// 删除中间表数据
$pk = $this->parent->getPk();
$pivot[$this->localKey] = $this->parent->$pk;
$pivot[$this->foreignKey] = is_array($id) ? ['in', $id] : $id;
$query = clone $this->parent->db();
$pk = $this->parent->getPk();
$pivot[$this->localKey] = $this->parent->$pk;
if (isset($id)) {
$pivot[$this->foreignKey] = is_array($id) ? ['in', $id] : $id;
}
$query = clone $this->parent->db();
$query->table($this->middle)->where($pivot)->delete();
// 删除关联表数据
if ($relationDel) {
if (isset($id) && $relationDel) {
$model = $this->model;
$model::destroy($id);
}