summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-04 12:36:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-04 12:36:45 +0000
commit4ea714fb911ba78918688fc5236cc670d209c55c (patch)
tree02cf29ad7323cf08793af2db464a387d600d429d /lib
parent6994a81209bedaeb14a831f1d93e59dd146ad71d (diff)
downloadredmine-4ea714fb911ba78918688fc5236cc670d209c55c.tar.gz
redmine-4ea714fb911ba78918688fc5236cc670d209c55c.zip
Fixed: child_pages macro fails on wiki page history (#4152).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3006 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/wiki_formatting/macros.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index abc07b947..6f8d09d60 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -95,7 +95,7 @@ module Redmine
page = nil
if args.size > 0
page = Wiki.find_page(args.first.to_s, :project => @project)
- elsif obj.is_a?(WikiContent)
+ elsif obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)
page = obj.page
else
raise 'With no argument, this macro can be called from wiki pages only.'