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

Merging fixes into trunk.

Browse source 
Revision: [2480]
Adding fix for Ticket #662


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2482 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-04-11 21:13:00 +00:00
parent a95a8c0a61
commit ef9836b402
2 changed files with 7 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 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.0.0.2479
1.0.0.2482

7
cake/libs/model/datasources/dbo_source.php
View file

@ -1390,7 +1390,12 @@ class DboSource extends DataSource
{
$value= ' '.$value;
}
$order[] = $this->order($this->name($key).$value);
if(!preg_match('/^.+\\(.*\\)/', $key))
{
$key = $this->name($key);
}
$order[] = $this->order($key.$value);
}
return ' ORDER BY '. r('ORDER BY', '', join(',', $order));
}