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

Merged:

Browse source 
[1683]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1684 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-12-29 08:26:45 +00:00
parent d29b4cd147
commit acac978896
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.4.1682_beta
0.10.4.1684_beta

2
cake/libs/model/model.php
View file

@ -1182,7 +1182,7 @@ class Model extends Object
$tmpSQL = "SELECT {$this->{$association.'_fields'}} FROM {$this->{$model}->table} AS `{$association}`
WHERE ({$this->{$association.'_foreignkey'}}) = '{$value2[$this->primaryKey]}'"
.($oneToManyConditions? " {$oneToManyConditions}":null)
.($oneToManyConditions? "AND {$oneToManyConditions}":null)
.($oneToManyOrder? " ORDER BY {$oneToManyOrder}": null);
}