Assign before actually using it.

cakephp · Nov 12, 2013 · 67a6566 · 67a6566
1 parent 0265650
commit 67a6566
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -1606,13 +1606,13 @@ public function generateAssociationQuery(Model $Model, $linkModel, $type, $assoc
 		switch ($type) {
 			case 'hasOne':
 			case 'belongsTo':
+				$self = ($Model->name === $linkModel->name);
+
 				$conditions = $this->_mergeConditions(
 					$assocData['conditions'],
 					$this->getConstraint($type, $Model, $linkModel, $association, array_merge($assocData, compact('external', 'self')))
 				);
 
-				$self = ($Model->name === $linkModel->name);
-
 				if (!$self && $external) {
 					$modelAlias = $Model->alias;
 					foreach ($conditions as $key => $condition) {