meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r21612 to 5.0-stable (35892).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21617 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-05-28 09:59:39 +00:00
parent c85038d830
commit 283f0a655e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
View File

@ -71,8 +71,8 @@ module Redmine
node = env[:node] node = env[:node]
return unless node.name == "a" || node.name == "li" return unless node.name == "a" || node.name == "li"
return unless node.has_attribute?("id") return unless node.has_attribute?("id")
return if node.name == "a" && node["id"] =~ /\Afnref\d+\z/ return if node.name == "a" && node["id"] =~ /\Afnref-\d+\z/
return if node.name == "li" && node["id"] =~ /\Afn\d+\z/ return if node.name == "li" && node["id"] =~ /\Afn-\d+\z/
node.remove_attribute("id") node.remove_attribute("id")
} }

6
test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb
View File

@ -148,10 +148,10 @@ class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase
STR STR
expected = <<~EXPECTED expected = <<~EXPECTED
<p>This is some text<sup><a href="#fn1" id="fnref1">1</a></sup>.</p> <p>This is some text<sup><a href="#fn-1" id="fnref-1">1</a></sup>.</p>
<ol> <ol>
<li id="fn1"> <li id="fn-1">
<p>This is the foot note <a href="#fnref1">↩</a></p> <p>This is the foot note <a href="#fnref-1" aria-label=\"Back to content\">↩</a></p>
</li> </li>
</ol> </ol>
EXPECTED EXPECTED