Commit 46cbe63c by Qiang Xue

Merge pull request #3114 from thiagotalma/patch-1

Update ActiveQuery.php
parents c3f4e005 563e7e01
...@@ -416,7 +416,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -416,7 +416,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
// remove duplicated joins added by joinWithRelations that may be added // remove duplicated joins added by joinWithRelations that may be added
// e.g. when joining a relation and a via relation at the same time // e.g. when joining a relation and a via relation at the same time
$uniqueJoins = []; $uniqueJoins = [];
foreach($this->join as $j) { foreach ($this->join as $j) {
$uniqueJoins[serialize($j)] = $j; $uniqueJoins[serialize($j)] = $j;
} }
$this->join = array_values($uniqueJoins); $this->join = array_values($uniqueJoins);
...@@ -641,6 +641,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -641,6 +641,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* The new condition and the existing one will be joined using the 'AND' operator. * The new condition and the existing one will be joined using the 'AND' operator.
* @param string|array $condition the new ON condition. Please refer to [[where()]] * @param string|array $condition the new ON condition. Please refer to [[where()]]
* on how to specify this parameter. * on how to specify this parameter.
* @param array $params the parameters (name => value) to be bound to the query.
* @return static the query object itself * @return static the query object itself
* @see onCondition() * @see onCondition()
* @see orOnCondition() * @see orOnCondition()
...@@ -661,6 +662,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -661,6 +662,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* The new condition and the existing one will be joined using the 'OR' operator. * The new condition and the existing one will be joined using the 'OR' operator.
* @param string|array $condition the new ON condition. Please refer to [[where()]] * @param string|array $condition the new ON condition. Please refer to [[where()]]
* on how to specify this parameter. * on how to specify this parameter.
* @param array $params the parameters (name => value) to be bound to the query.
* @return static the query object itself * @return static the query object itself
* @see onCondition() * @see onCondition()
* @see andOnCondition() * @see andOnCondition()
......
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