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

This commit is contained in:
Qiang Xue
2014-04-22 14:54:12 -04:00

View File

@@ -44,7 +44,7 @@ trait ActiveRelationTrait
*/
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.
* This property is only used in relational context.
* @see via()