Skip to content
Browse files

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

Conflicts:
	classes/kohana/database/query/builder.php
  • Loading branch information...
2 parents 82709bc + 27d8ba4 commit 4acfcdbdc47135e8e8161135bd012289c4045136 @cbandy cbandy committed May 3, 2011
Showing with 2 additions and 8 deletions.
  1. +2 −8 classes/kohana/database/query/builder.php
View
10 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 4acfcdb

Please sign in to comment.
Something went wrong with that request. Please try again.