Rename joined to _joined to hopefully prevent issues.

cakephp · May 28, 2012 · 115b2c1 · 115b2c1
1 parent 364c293
commit 115b2c1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -1113,7 +1113,7 @@ public function read(Model $model, $queryData = array(), $recursive = null) {
 
 					if (isset($db) && method_exists($db, 'queryAssociation')) {
 						$stack = array($assoc);
-						$stack['joined'] = $joined;
+						$stack['_joined'] = $joined;
 						$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
 						unset($db);
 
@@ -1182,9 +1182,9 @@ protected function _filterResults(&$results, Model $model, $filtered = array())
  * @throws CakeException when results cannot be created.
  */
 	public function queryAssociation(Model $model, &$linkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet, $recursive, $stack) {
-		if (isset($stack['joined'])) {
-			$joined = $stack['joined'];
-			unset($stack['joined']);
+		if (isset($stack['_joined'])) {
+			$joined = $stack['_joined'];
+			unset($stack['_joined']);
 		}
 
 		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {