From e2a1094e69fa37e772fb9549ef7c4a5c3af4e7c2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 16 Oct 2015 23:07:25 -0400
Subject: [PATCH] Define variables before they are used.

Refs #7563
---
 lib/Cake/Model/Datasource/DboSource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 75a18dcf407..04cd13247a1 100644
--- 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();
 	}
 
-}
\ No newline at end of file
+}