php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-14 13:25:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Qiang Xue
2014-04-22 14:54:12 -04:00
parent 051b4194e9 2b593da08f
commit f1ff318abc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/db/ActiveRelationTrait.php
View File

@@ -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()