Merge branch '3.1/develop' into 3.2/develop. Refs #3485

kohana · May 3, 2011 · 395e04a · 395e04a
2 parents d9c179c + 4acfcdb
commit 395e04a
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/classes/kohana/database/query/builder.php b/classes/kohana/database/query/builder.php
@@ -180,16 +180,10 @@ protected function _compile_order_by(Database $db, array $columns)
 			if ($direction)
 			{
 				// Make the direction uppercase
-				$direction = strtoupper($direction);
+				$direction = ' '.strtoupper($direction);
 			}
 
-			if ($column)
-			{
-				// Quote the column, if it has a value
-				$column = $db->quote_column($column);
-			}
-
-			$sort[] = trim($column.' '.$direction);
+			$sort[] = $db->quote_identifier($column).$direction;
 		}
 
 		return 'ORDER BY '.implode(', ', $sort);