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

修正Model类

Browse Source
This commit is contained in:
thinkphp
2016-07-06 19:12:33 +08:00
parent 6c6ac73ee0
commit 4acbc4077d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Model.php
View File

@@ -172,7 +172,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
if (!is_null($relation)) { if (!is_null($relation)) {
// 执行关联查询 // 执行关联查询
return $this->db->relation($relation); return $this->db()->relation($relation);
} }
// 获取关联对象实例 // 获取关联对象实例
@@ -578,7 +578,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 检测字段 // 检测字段
if (!empty($this->field)) { if (!empty($this->field)) {
if (true === $this->field) { if (true === $this->field) {
$this->field = $this->db->getTableInfo('', 'fields'); $this->field = $this->db()->getTableInfo('', 'fields');
} }
foreach ($this->data as $key => $val) { foreach ($this->data as $key => $val) {
if (!in_array($key, $this->field)) { if (!in_array($key, $this->field)) {