| @@ -207,8 +207,8 module Redmine | |||||
| 207 | page = Wiki.find_page(args.first.to_s, :project => @project) |
|
207 | page = Wiki.find_page(args.first.to_s, :project => @project) | |
| 208 | raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project) |
|
208 | raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project) | |
| 209 | @included_wiki_pages ||= [] |
|
209 | @included_wiki_pages ||= [] | |
| 210 |
raise 'Circular inclusion detected' if @included_wiki_pages.include?(page. |
|
210 | raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.id) | |
| 211 |
@included_wiki_pages << page. |
|
211 | @included_wiki_pages << page.id | |
| 212 | out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false) |
|
212 | out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false) | |
| 213 | @included_wiki_pages.pop |
|
213 | @included_wiki_pages.pop | |
| 214 | out |
|
214 | out | |
General Comments 0
You need to be logged in to leave comments.
Login now