diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-05-28 09:59:39 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-05-28 09:59:39 +0000 |
| commit | 283f0a655e9933822db90f2b5da8e02e8df07370 (patch) | |
| tree | bfb3f86b764294d96fce4aaa23a4bfb747a53e30 | |
| parent | c85038d83006479efc5efde7e5f8c2b35d1f3255 (diff) | |
| download | redmine-283f0a655e9933822db90f2b5da8e02e8df07370.tar.gz redmine-283f0a655e9933822db90f2b5da8e02e8df07370.zip | |
Merged r21612 to 5.0-stable (35892).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21617 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb | 4 | ||||
| -rw-r--r-- | test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb index 9c1dee13a..7fef35bfa 100644 --- a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb +++ b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb @@ -71,8 +71,8 @@ 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 == "li" && node["id"] =~ /\Afn\d+\z/ + return if node.name == "a" && node["id"] =~ /\Afnref-\d+\z/ + return if node.name == "li" && node["id"] =~ /\Afn-\d+\z/ node.remove_attribute("id") } diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb index ee46e5d8e..2eeb28759 100644 --- a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb @@ -148,10 +148,10 @@ class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase STR 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> - <li id="fn1"> - <p>This is the foot note <a href="#fnref1">↩</a></p> + <li id="fn-1"> + <p>This is the foot note <a href="#fnref-1" aria-label=\"Back to content\">↩</a></p> </li> </ol> EXPECTED |