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

Assign before actually using it.

Browse source
This commit is contained in:
Ber Clausen 2013-11-12 01:13:55 -03:00
parent 026565033b
commit 67a65663a7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1606,13 +1606,13 @@ class DboSource extends DataSource {
switch ($type) { switch ($type) {
case 'hasOne': case 'hasOne':
case 'belongsTo': case 'belongsTo':
$self = ($Model->name === $linkModel->name);
$conditions = $this->_mergeConditions( $conditions = $this->_mergeConditions(
$assocData['conditions'], $assocData['conditions'],
$this->getConstraint($type, $Model, $linkModel, $association, array_merge($assocData, compact('external', 'self'))) $this->getConstraint($type, $Model, $linkModel, $association, array_merge($assocData, compact('external', 'self')))
); );
$self = ($Model->name === $linkModel->name);
if (!$self && $external) { if (!$self && $external) {
$modelAlias = $Model->alias; $modelAlias = $Model->alias;
foreach ($conditions as $key => $condition) { foreach ($conditions as $key => $condition) {