Skip to content

Y
yii2
Commit f1ff318a by Qiang Xue
Options

Merge branch 'master' of git://github.com/yiisoft/yii2

parents 051b4194 2b593da0
Showing with 1 addition and 1 deletion
framework/db/ActiveRelationTrait.php
...@@ -44,7 +44,7 @@ trait ActiveRelationTrait ...@@ -44,7 +44,7 @@ trait ActiveRelationTrait
*/ */
public $link; public $link;
/** /**
* @var array the query associated with the pivot table. Please call [[via()]] * @var array|object the query associated with the pivot table. Please call [[via()]]
* to set this property instead of directly setting it. * to set this property instead of directly setting it.
* This property is only used in relational context. * This property is only used in relational context.
* @see via() * @see via()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment