adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be more semantic indicating that association fields must be empty.

Browse source
This commit is contained in:
Ber Clausen 2013-12-20 00:57:38 -03:00
parent 99c8503578
commit 8355d32bb1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1046,11 +1046,11 @@ class DboSource extends DataSource {
$Model->recursive = $recursive;
}
$bypass = false;
if (!empty($queryData['fields'])) {
$bypass = true;
$noAssocFields = true;
$queryData['fields'] = $this->fields($Model, null, $queryData['fields']);
} else {
$noAssocFields = false;
$queryData['fields'] = $this->fields($Model);
}
@ -1076,7 +1076,7 @@ class DboSource extends DataSource {
continue;
}
if ($bypass) {
if ($noAssocFields) {
$assocData['fields'] = false;
}