Adding DboSource::order parsing fix for Ticket #1677

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4004 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-11-28 08:18:53 +00:00
parent 881dc728cf
commit cc484ddbd2

View file

@ -1520,7 +1520,7 @@ class DboSource extends DataSource {
* @return string ORDER BY clause
*/
function order($keys, $direction = 'ASC') {
if (is_string($keys) && strpos($keys, ',')) {
if (is_string($keys) && strpos($keys, ',') && !preg_match('/\(.+\,.+\)/', $keys)) {
$keys = explode(',', $keys);
array_map('trim', $keys);
}