Merged r2183 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.7-stable@2185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-27 14:08:09 +00:00
parent a98d4de1e3
commit 6ae66f4dbf
2 changed files with 3 additions and 3 deletions
@@ -42,7 +42,7 @@ class BoardsController < ApplicationController
      
    @topic_count = @board.topics.count
    @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
-    @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
+    @topics =  @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '),
                                  :include => [:author, {:last_reply => :author}],
                                  :limit  =>  @topic_pages.items_per_page,
                                  :offset =>  @topic_pages.current.offset