Merged r2183 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2184 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-27 14:07:00 +00:00
parent 16b85bda32
commit 78cac6f02b
2 changed files with 3 additions and 3 deletions
@@ -84,14 +84,14 @@ module SortHelper
    session[@sort_name] = sort
    
    sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
-    @sort_clause = (sort_column.blank? ? '' : "#{sort_column} #{sort[:order]}")
+    @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}")
  end

  # Returns an SQL sort clause corresponding to the current sort state.
  # Use this to sort the controller's table items collection.
  #
  def sort_clause()
-    @sort_clause || '' #session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
+    @sort_clause
  end

  # Returns a link which sorts by the named column.