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

修正

Browse Source
This commit is contained in:
thinkphp
2016-04-18 10:58:20 +08:00
parent 289f2e7741
commit 2a09d8d8db
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/model/Relation.php
View File

@@ -240,7 +240,7 @@ class Relation
// 重新组装模型数据
foreach ($result->toArray() as $key => $val) {
if (strpos($key, '__')) {
list($name, $attr) = explode('__', $key);
list($name, $attr) = explode('__', $key,2);
if ($name == $modelName) {
$list[$name][$attr] = $val;
unset($result->$key);
@@ -300,7 +300,7 @@ class Relation
$pivot = [];
foreach ($set->toArray() as $key => $val) {
if (strpos($key, '__')) {
list($name, $attr) = explode('__', $key);
list($name, $attr) = explode('__', $key,2);
if ('pivot' == $name) {
$pivot[$attr] = $val;
unset($set->$key);