mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
parent
fea6fd7d30
commit
e2a1094e69
1 changed files with 2 additions and 1 deletions
|
@ -1562,6 +1562,7 @@ class DboSource extends DataSource {
|
|||
}
|
||||
} 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 @@ class DboSource extends DataSource {
|
|||
parent::__destruct();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue