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

修正Query类

Browse Source
This commit is contained in:
thinkphp
2017-04-17 08:54:40 +08:00
parent 8dc793d76c
commit 9ea7f48e1a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/db/Query.php
View File

@@ -1999,7 +1999,7 @@ class Query
$relation = explode(',', $relation); $relation = explode(',', $relation);
} }
if (isset($this->options['relation'])) { if (isset($this->options['relation'])) {
$this->options['relation'] = array_mrege($this->options['relation'], $relation); $this->options['relation'] = array_merge($this->options['relation'], $relation);
} else { } else {
$this->options['relation'] = $relation; $this->options['relation'] = $relation;
} }