Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-21 23:13:04 +01:00
Code Issues Packages Projects Releases Activity

Merged r23726 from trunk to 6.0-stable (#42648).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23732 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2025-05-01 08:27:49 +00:00
parent 1cfe0589c9
commit 562dfdf670
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ module Redmine
node = env[:node]
return unless node.name == "a" || node.name == "li"
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+){1,2}\z/
return if node.name == "li" && node["id"] =~ /\Afn-\d+\z/
node.remove_attribute("id")

12
test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
View File

@@ -47,10 +47,14 @@ if Object.const_defined?(:CommonMarker)
end
def test_should_support_footnotes
input = %(<a href="#fn-1" id="fnref-1">foo</a>)
assert_equal input, filter(input)
input = %(<ol><li id="fn-1">footnote</li></ol>)
assert_equal input, filter(input)
[
%(<a href="#fn-1" id="fnref-1">foo</a>),
%(<a href="#fn-1" id="fnref-1-2">foo</a>),
%(<ol><li id="fn-1">footnote</li></ol>),
].each do |input|
assert_equal input, filter(input)
assert_equal input, filter(input)
end
end
def test_should_remove_invalid_ids