diff app/controllers/wiki_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/controllers/wiki_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/wiki_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -277,14 +277,19 @@
 
   # 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
         send_data(export, :type => 'text/html', :filename => "wiki.html")
       }
       format.pdf {
-        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
+        send_data(wiki_pages_to_pdf(@pages, @project),
+                  :type => 'application/pdf',
+                  :filename => "#{@project.identifier}.pdf")
       }
     end
   end
@@ -351,6 +356,10 @@
   end
 
   def load_pages_for_index
-    @pages = @wiki.pages.with_updated_on.reorder("#{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