summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/redmine/wiki_formatting/textile/redcloth3.rb9
-rw-r--r--test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb12
2 files changed, 4 insertions, 17 deletions
diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index 5da17be5b..8d83c79d9 100644
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -288,14 +288,13 @@ 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 f8c7d520a..4bbef9996 100644
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -621,18 +621,6 @@ 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)