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

Merged r17636 from trunk to 3.4-stable (#8395).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17637 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-11-26 04:56:19 +00:00
parent f7c9ba30a8
commit a7f6830a8e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/wiki_formatting/textile/redcloth3.rb
View File

@ -1049,7 +1049,7 @@ class RedCloth3 < String
end
OFFTAGS = /(code|pre|kbd|notextile)/
OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }\b>)|(<#{ OFFTAGS }\b[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\b\W|\Z)/mi
OFFTAG_OPEN = /<#{ OFFTAGS }/
OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m

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

@ -586,6 +586,22 @@ STR
assert_nothing_raised { to_html(" \v") }
end
def test_should_not_handle_as_preformatted_text_tags_that_starts_with_pre
text = <<-STR
<pree>
This is some text
</pree>
STR
expected = <<-EXPECTED
<p>&lt;pree&gt;<br />
This is some text<br />
&lt;/pree&gt;</p>
EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '')
end
private
def assert_html_output(to_test, expect_paragraph = true)