Skip to content
Permalink
Browse files

Define variables before they are used.

Refs #7563
  • Loading branch information...
markstory committed Oct 17, 2015
1 parent fea6fd7 commit e2a1094e69fa37e772fb9549ef7c4a5c3af4e7c2
Showing with 2 additions and 1 deletion.
  1. +2 −1 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();
}
}
}

0 comments on commit e2a1094

Please sign in to comment.
You can’t perform that action at this time.