From be6d528f68773dab4f5d552bf0480c8b71d518dc Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 18 Jan 2017 10:25:10 +0800 Subject: [PATCH] =?UTF-8?q?collection=E5=8A=A9=E6=89=8B=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9Ethink\Collection=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helper.php | 2 +- library/think/model/relation/MorphMany.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/helper.php b/helper.php index d74f3d58..d5946fb2 100644 --- a/helper.php +++ b/helper.php @@ -14,6 +14,7 @@ //------------------------- use think\Cache; +use think\Collection; use think\Config; use think\Cookie; use think\Db; @@ -23,7 +24,6 @@ use think\exception\HttpResponseException; use think\Lang; use think\Loader; use think\Log; -use think\model\Collection; use think\Request; use think\Response; use think\Session; diff --git a/library/think/model/relation/MorphMany.php b/library/think/model/relation/MorphMany.php index c4c23df7..68eb0834 100644 --- a/library/think/model/relation/MorphMany.php +++ b/library/think/model/relation/MorphMany.php @@ -160,6 +160,7 @@ class MorphMany extends Relation * @param array $where 关联预查询条件 * @param string $relation 关联名 * @param string $subRelation 子关联 + * @param \Closure $closure 闭包 * @return array */ protected function eagerlyMorphToMany($where, $relation, $subRelation = '', $closure = false)