php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into SamMousa-indexby-after-relations-9342

Browse Source 
Conflicts:
	framework/db/Query.php
This commit is contained in:
SilverFire - Dmitry Naumenko
2018-02-15 23:38:06 +02:00
parent afd59a18ec a1b5f077e0
commit c3c9d1fd97
631 changed files with 19994 additions and 3906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/ActiveQueryTrait.php
View File

@ -137,7 +137,9 @@ trait ActiveQueryTrait
{
$primaryModel = reset($models);
if (!$primaryModel instanceof ActiveRecordInterface) {
$primaryModel = new $this->modelClass();
/* @var $modelClass ActiveRecordInterface */
$modelClass = $this->modelClass;
$primaryModel = $modelClass::instance();
}
$relations = $this->normalizeRelations($primaryModel, $with);
/* @var $relation ActiveQuery */