fix compliancy with more elaborate ORDER syntax, such as "DESC NULLS …

…FIRST" in postgresql, in DboSource::order()
cakephp · Mar 9, 2010 · a79ff50 · a79ff50
1 parent bed4027
commit a79ff50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -2333,9 +2333,9 @@ function order($keys, $direction = 'ASC', $model = null) {
 				continue;
 			}
 
-			if (preg_match('/\\x20ASC|\\x20DESC/i', $key, $_dir)) {
+			if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) {
 				$dir = $_dir[0];
-				$key = preg_replace('/\\x20ASC|\\x20DESC/i', '', $key);
+				$key = preg_replace('/\\x20(ASC|DESC).*/i', '', $key);
 			}
 
 			if (strpos($key, '.')) {