comparison lib/redmine/wiki_formatting/.svn/text-base/macros.rb.svn-base @ 37:94944d00e43c

* Update to SVN trunk rev 4411
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 19 Nov 2010 13:24:41 +0000
parents 513646585e45
children
comparison
equal deleted inserted replaced
22:40f7cfd4df19 37:94944d00e43c
110 page = Wiki.find_page(args.first.to_s, :project => @project) 110 page = Wiki.find_page(args.first.to_s, :project => @project)
111 raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project) 111 raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project)
112 @included_wiki_pages ||= [] 112 @included_wiki_pages ||= []
113 raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title) 113 raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
114 @included_wiki_pages << page.title 114 @included_wiki_pages << page.title
115 out = textilizable(page.content, :text, :attachments => page.attachments) 115 out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false)
116 @included_wiki_pages.pop 116 @included_wiki_pages.pop
117 out 117 out
118 end 118 end
119 end 119 end
120 end 120 end