From 7484cf07b65678eebfe099fb98d0e4157008bb52 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 11 Jan 2014 06:03:38 +0000
Subject: cleanup syntax of Relation#all at WikiController#export

git-svn-id: http://svn.redmine.org/redmine/trunk@12620 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 22f075f60..c68f15afd 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -277,7 +277,10 @@ class WikiController < ApplicationController
 
   # Export wiki to a single pdf or html file
   def export
-    @pages = @wiki.pages.all(:order => 'title', :include => [:content, {:attachments => :author}])
+    @pages = @wiki.pages.
+                      order('title').
+                      includes([:content, {:attachments => :author}]).
+                      all
     respond_to do |format|
       format.html {
         export = render_to_string :action => 'export_multiple', :layout => false
-- 
cgit v1.2.3