summaryrefslogtreecommitdiffstats
path: root/app/controllers/wiki_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-03 13:40:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-03 13:40:50 +0000
commit24ec41f7d4893641b9aa27830298f5f55e22a201 (patch)
tree68fece43afcae4a85cd88a5c3b7431ba19f7734a /app/controllers/wiki_controller.rb
parent503933c585885adaf5c73957d033eb595b13beca (diff)
downloadredmine-24ec41f7d4893641b9aa27830298f5f55e22a201.tar.gz
redmine-24ec41f7d4893641b9aa27830298f5f55e22a201.zip
A column has been specified more than once in the order by list (#12713).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11106 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/wiki_controller.rb')
-rw-r--r--app/controllers/wiki_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 6d3b44636..c3d5f5ac4 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -351,6 +351,6 @@ private
end
def load_pages_for_index
- @pages = @wiki.pages.with_updated_on.order("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
+ @pages = @wiki.pages.with_updated_on.reorder("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
end
end