summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-26 12:54:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-26 12:54:54 +0000
commitec7d1359301b28a506d3c9e9ad5785cf84d3fcd9 (patch)
tree3ebc58910568791073a3e955b996c8fd5313e193 /app/controllers
parent60d066f943c68a348fee3a8350dc5ba88878b69c (diff)
downloadredmine-ec7d1359301b28a506d3c9e9ad5785cf84d3fcd9.tar.gz
redmine-ec7d1359301b28a506d3c9e9ad5785cf84d3fcd9.zip
Adds child_pages macro for wiki pages (#528).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1699 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/wiki_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 2430205cf..5a5f3949f 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -165,7 +165,10 @@ class WikiController < ApplicationController
page = @wiki.find_page(params[:page])
# page is nil when previewing a new page
return render_403 unless page.nil? || editable?(page)
- @attachements = page.attachments if page
+ if page
+ @attachements = page.attachments
+ @previewed = page.content
+ end
@text = params[:content][:text]
render :partial => 'common/preview'
end