adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3015 from cakephp/dbosource-bc-fix

Browse source 
2.5 - Dbosource bc fix
This commit is contained in:
Mark Story 2014-03-14 14:28:21 -04:00
commit 100595b717
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1641,9 +1641,13 @@ class DboSource extends DataSource {
* String representing a query.
* True, when $external is false and association $type is 'hasOne' or 'belongsTo'.
*/
public function generateAssociationQuery(Model $Model, Model $LinkModel, $type, $association, $assocData, &$queryData, $external) {
public function generateAssociationQuery(Model $Model, $LinkModel, $type, $association, $assocData, &$queryData, $external) {
$assocData = $this->_scrubQueryData($assocData);
if ($LinkModel === null) {
return '';
}
if ($external && !empty($assocData['finderQuery'])) {
return $assocData['finderQuery'];
}