summaryrefslogtreecommitdiffstats
path: root/app/controllers/boards_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-27 14:05:03 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-27 14:05:03 +0000
commitfb1f72a09c6493a8e587013185560b74b7250e4b (patch)
tree4bd3da419cf5201b97be840633e5373b9f2faf63 /app/controllers/boards_controller.rb
parent03fd86034d032ae1eb0305746ee67cd520adc0b6 (diff)
downloadredmine-fb1f72a09c6493a8e587013185560b74b7250e4b.tar.gz
redmine-fb1f72a09c6493a8e587013185560b74b7250e4b.zip
Prevent SQL error with old sessions after r2171.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2183 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/boards_controller.rb')
-rw-r--r--app/controllers/boards_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index c6ce934ee..55a9737f5 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -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