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

Merged r14863 (#6969).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14865 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-11-11 07:35:24 +00:00
parent ac0cf9916c
commit 78970eb649
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redcloth3.rb
View File

@@ -1202,7 +1202,7 @@ class RedCloth3 < String
ALLOWED_TAGS = %w(redpre pre code notextile)
def escape_html_tags(text)
text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)?(>?)}) {|m| $2 && ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
end
end

9
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
View File

@@ -154,19 +154,12 @@ EXPECTED
assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
end
def test_should_escape_unallowed_tags
def test_escaping
assert_html_output(
'this is a <script>' => 'this is a &lt;script&gt;'
)
end
def test_should_escape_less_than_signs
assert_html_output(
'<' => '&lt;',
'1 < 2' => '1 &lt; 2'
)
end
def test_use_of_backslashes_followed_by_numbers_in_headers
assert_html_output({
'h1. 2009\02\09' => '<h1>2009\02\09</h1>'