Browse Source

Make sure query cloning works as expected.

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
cb60fa5ddd
  1. 1
      framework/yii/data/ActiveDataProvider.php
  2. 10
      framework/yii/db/ActiveRelation.php

1
framework/yii/data/ActiveDataProvider.php

@ -9,7 +9,6 @@ namespace yii\data;
use Yii;
use yii\base\InvalidConfigException;
use yii\base\InvalidParamException;
use yii\base\Model;
use yii\db\Query;
use yii\db\ActiveQuery;

10
framework/yii/db/ActiveRelation.php

@ -50,6 +50,16 @@ class ActiveRelation extends ActiveQuery
*/
public $via;
/**
* Clones internal objects.
*/
public function __clone()
{
if (is_object($this->via)) {
// make a clone of "via" object so that the same query object can be reused multiple times
$this->via = clone $this->via;
}
}
/**
* Specifies the relation associated with the pivot table.

Loading…
Cancel
Save