Joins are an integral parat of a query, keeping them for count operat…

…ions Fixes #4511
cakephp · Sep 6, 2014 · be67ce8 · be67ce8
1 parent 7458089
commit be67ce8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/ORM/Association/SelectableAssociationTrait.php b/src/ORM/Association/SelectableAssociationTrait.php
@@ -160,6 +160,7 @@ protected abstract function _linkField($options);
  */
 	protected function _buildSubquery($query) {
 		$filterQuery = $query->cleanCopy();
+		$filterQuery->contain([], true);
 
 		$joins = $filterQuery->join();
 		foreach ($joins as $i => $join) {

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -492,7 +492,6 @@ public function cleanCopy() {
 		$query->offset(null);
 		$query->mapReduce(null, null, true);
 		$query->formatResults(null, true);
-		$query->contain([], true);
 		return $query;
 	}