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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-12-23 10:53:39 +08:00
parent a996640c7e 4b6a39f6d3
commit c47621294a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model/relation/BelongsToMany.php
View File

@@ -239,9 +239,11 @@ class BelongsToMany extends Relation
$result = false; $result = false;
foreach ($dataSet as $key => $data) { foreach ($dataSet as $key => $data) {
if (!$samePivot) { if (!$samePivot) {
$pivot = !empty($pivot) ? $pivot[$key] : []; $pivotData = isset($pivot[$key]) ? $pivot[$key] : [];
} else {
$pivotData = $pivot;
} }
$result = $this->attach($data, $pivot); $result = $this->attach($data, $pivotData);
} }
return $result; return $result;
} }