From 115b2c14958df8c9b7a7552fcd5c2c85b45f4ef9 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 27 May 2012 20:43:15 -0400 Subject: [PATCH] Rename joined to _joined to hopefully prevent issues. --- lib/Cake/Model/Datasource/DboSource.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index ecccf0dc3a0..da4a7f73483 100644 --- 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)) {