adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 13:02:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging __mergeAssociation() into 1.2 branch

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3793 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-11-01 19:27:08 +00:00
parent f187ac9cef
commit 708dc77ae8
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cake/libs/model/datasources/dbo_source.php
View file

@ -1140,6 +1140,29 @@ class DboSource extends DataSource {
}
return null;
}
/**
* Private method
*
* @return array
*/
function __mergeConditions(&$queryData, $assocData) {
if (isset($assocData['conditions']) && !empty($assocData['conditions'])) {
if (is_array($queryData['conditions'])) {
$queryData['conditions'] = array_merge((array)$assocData['conditions'], $queryData['conditions']);
} else {
if (!empty($queryData['conditions'])) {
$queryData['conditions'] = array($queryData['conditions']);
if (is_array($assocData['conditions'])) {
$queryData['conditions'] = array_merge($queryData['conditions'], $assocData['conditions']);
} else {
$queryData['conditions'][] = $assocData['conditions'];
}
} else {
$queryData['conditions'] = $assocData['conditions'];
}
}
}
}
/**
* Generates and executes an SQL UPDATE statement for given model, fields, and values.
*