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

Add documentation. Strict check.

Browse source
This commit is contained in:
Ber Clausen 2013-12-21 04:19:02 -03:00
parent 1bdb783f91
commit c1cdf190e3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1079,6 +1079,7 @@ class DboSource extends DataSource {
if ($bypass) {
$assocData['fields'] = false;
}
$external = isset($assocData['external']);
if ($this->generateAssociationQuery($Model, $LinkModel, $type, $assoc, $assocData, $queryData, $external) === true) {
@ -1148,9 +1149,9 @@ class DboSource extends DataSource {
}
/**
* Passes association results through afterFind filters of corresponding model.
* Passes association results through afterFind filters of the corresponding model.
*
* The primary model is always filtered.
* The primary model is always excluded, because the filtering is later done by Model::_filterResults().
*
* @param array $results Reference of resultset to be filtered
* @param Model $Model Instance of model to operate against
@ -1588,7 +1589,7 @@ class DboSource extends DataSource {
return $assocData['finderQuery'];
}
if (in_array($type, array('hasMany', 'hasAndBelongsToMany'))) {
if ($type === 'hasMany' || $type === 'hasAndBelongsToMany') {
if (empty($assocData['offset']) && !empty($assocData['page'])) {
$assocData['offset'] = ($assocData['page'] - 1) * $assocData['limit'];
}
@ -1603,7 +1604,7 @@ class DboSource extends DataSource {
);
if ($external) {
// Self join
// Not self join
if ($Model->name !== $LinkModel->name) {
$modelAlias = $Model->alias;
foreach ($conditions as $key => $condition) {