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

内核代码升级

Browse Source
This commit is contained in:
molong
2016-09-08 16:38:09 +08:00
parent acd3e6fa25
commit 7201db324e
19 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ class Relation
$result = $this->belongsToManyQuery($relation, $this->middle, $foreignKey, $localKey, $condition)->select();
foreach ($result as $set) {
$pivot = [];
foreach ($set->toArray() as $key => $val) {
foreach ($set->getData() as $key => $val) {
if (strpos($key, '__')) {
list($name, $attr) = explode('__', $key, 2);
if ('pivot' == $name) {
@@ -308,7 +308,7 @@ class Relation
protected function match($model, $relation, &$result)
{
// 重新组装模型数据
foreach ($result->toArray() as $key => $val) {
foreach ($result->getData() as $key => $val) {
if (strpos($key, '__')) {
list($name, $attr) = explode('__', $key, 2);
if ($name == $relation) {
@@ -369,7 +369,7 @@ class Relation
$data = [];
foreach ($list as $set) {
$pivot = [];
foreach ($set->toArray() as $key => $val) {
foreach ($set->getData() as $key => $val) {
if (strpos($key, '__')) {
list($name, $attr) = explode('__', $key, 2);
if ('pivot' == $name) {