From dbb7f64afcd02dffdb8beb019b99bd9ac84af292 Mon Sep 17 00:00:00 2001 From: Michael Esemplare Date: Wed, 18 Jan 2017 12:46:50 -0800 Subject: Modify circular inclusion test to use page.id instead of page.title as pages across projects may share the same name. --- lib/redmine/wiki_formatting/macros.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index f874837..1ec6035 100644 --- a/lib/redmine/wiki_formatting/macros.rb +++ b/lib/redmine/wiki_formatting/macros.rb @@ -207,8 +207,8 @@ module Redmine page = Wiki.find_page(args.first.to_s, :project => @project) raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project) @included_wiki_pages ||= [] - raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title) - @included_wiki_pages << page.title + raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.id) + @included_wiki_pages << page.id out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false) @included_wiki_pages.pop out -- 2.8.3