meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Multiple blank lines in pre tags are not preserved in Textile (#30099).

Browse Source 
Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@17891 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-02-20 10:31:30 +00:00
parent ffcd722c40
commit ef9c879718
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,13 +288,14 @@ class RedCloth3 < String
end end
end.flatten end.flatten
# standard clean up
incoming_entities text
clean_white_space text
# start processor # start processor
@pre_list = [] @pre_list = []
rip_offtags text rip_offtags text
# standard clean up
incoming_entities text
clean_white_space text
no_textile text no_textile text
escape_html_tags text escape_html_tags text
# need to do this before #hard_break and #blocks # need to do this before #hard_break and #blocks

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

@ -621,6 +621,18 @@ EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '') assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '')
end end
def test_should_preserve_multiple_blank_lines_in_pre_tags
text = <<-STR
<pre>
This is some text in pre
Two blank lines avobe
</pre>
STR
assert_equal text.chomp, to_html(text)
end
private private
def assert_html_output(to_test, expect_paragraph = true) def assert_html_output(to_test, expect_paragraph = true)