From: Go MAEDA <maeda@farend.jp>
Date: Wed, 20 Feb 2019 10:31:30 +0000 (+0000)
Subject: Multiple blank lines in pre tags are not preserved in Textile (#30099).
X-Git-Tag: 4.1.0~1100
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ef9c8797181548df46c093d05a88cc2d9173403e;p=redmine.git

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

Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@17891 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index 01f1bd458..5fbfc4338 100644
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -288,13 +288,14 @@ class RedCloth3 < String
             end
         end.flatten
 
-        # standard clean up
-        incoming_entities text 
-        clean_white_space text 
-
         # start processor
         @pre_list = []
         rip_offtags text
+
+        # standard clean up
+        incoming_entities text
+        clean_white_space text
+
         no_textile text
         escape_html_tags text
         # need to do this before #hard_break and #blocks
diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
index 4bbef9996..f8c7d520a 100644
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -621,6 +621,18 @@ EXPECTED
     assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '')
   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
 
   def assert_html_output(to_test, expect_paragraph = true)