summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-11-23 22:29:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-11-23 22:29:45 +0000
commite3958ef577eadeb5226fb2cccc790af1341a8f63 (patch)
tree919736471ae83281f611d79bf44555c994229609
parentc5f2dadb2ccaaf7fc05756728d3e43b6a8e6f4a1 (diff)
downloadredmine-e3958ef577eadeb5226fb2cccc790af1341a8f63.tar.gz
redmine-e3958ef577eadeb5226fb2cccc790af1341a8f63.zip
Merged r10838 from trunk (#12274).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10872 e93f8b46-1217-0410-a6f0-8f06a7374b81
-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 e9d060870..29d06d2e6 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -239,7 +239,7 @@ class WikiController < ApplicationController
# Export wiki to a single pdf or html file
def export
- @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)
+ @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments])
respond_to do |format|
format.html {
export = render_to_string :action => 'export_multiple', :layout => false