Define variables before they are used.

Refs #7563
cakephp · Oct 17, 2015 · e2a1094 · e2a1094
1 parent fea6fd7
commit e2a1094
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -1562,6 +1562,7 @@ protected function _mergeAssociation(&$data, &$merge, $association, $type, $self
 					}
 				} else {
 					if (is_array($merge[0][$association])) {
+						$mergeAssocTmp = array();
 						foreach ($dataAssociation as $k => $v) {
 							if (!is_array($v)) {
 								$dataAssocTmp[$k] = $v;
@@ -3586,4 +3587,4 @@ public function __destruct() {
 		parent::__destruct();
 	}
 
-}
+}