Fix relations with through

borro · borro · commit bc55d58c9da9 · 2022-10-18T13:52:22.000+03:00
diff --git a/framework/db/ar/CActiveFinder.php b/framework/db/ar/CActiveFinder.php
@@ -442,7 +442,7 @@ public function find($criteria=null)
 		}
 		elseif(!$this->_joined && !empty($this->_parent->records)) // not joined before
 		{
-			if (count($this->relation->foreignKey) === count($this->_parent->_pkAlias)) {
+			if (empty($this->relation->through) && count($this->relation->foreignKey) === count($this->_parent->_pkAlias)) {
 				$query            = new CJoinQuery($this);
 				$this->_joined    = true;
 				$query->selects   = array(); // reset to not receive the extra keys

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ public function find($criteria=null)`
`442`	`442`	`}`
`443`	`443`	`elseif(!$this->_joined && !empty($this->_parent->records)) // not joined before`
`444`	`444`	`{`
`445`		`- if (count($this->relation->foreignKey) === count($this->_parent->_pkAlias)) {`
	`445`	`+ if (empty($this->relation->through) && count($this->relation->foreignKey) === count($this->_parent->_pkAlias)) {`
`446`	`446`	`$query = new CJoinQuery($this);`
`447`	`447`	`$this->_joined = true;`
`448`	`448`	`$query->selects = array(); // reset to not receive the extra keys`