From: Jean-Philippe Lang Date: Thu, 19 Jan 2017 18:32:06 +0000 (+0000) Subject: Modify circular inclusion test to use page.id instead of page.title (#24869). X-Git-Tag: 3.4.0~384 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df5dba5ddec5f61a2022abcd1789da4604b21055;p=redmine.git Modify circular inclusion test to use page.id instead of page.title (#24869). Patch by Michael Esemplare. git-svn-id: http://svn.redmine.org/redmine/trunk@16227 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index f8748373b..1ec6035f7 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