Permalink
Browse files

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

  • Loading branch information...
2 parents d9c179c + 4acfcdb commit 395e04a874e589f8836ceecdba39114ab8298d76 @cbandy cbandy committed May 3, 2011
Showing with 2 additions and 8 deletions.
  1. +2 −8 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);

0 comments on commit 395e04a

Please sign in to comment.