summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-02-20 10:31:30 +0000
committerGo MAEDA <maeda@farend.jp>2019-02-20 10:31:30 +0000
commitef9c8797181548df46c093d05a88cc2d9173403e (patch)
tree7d8588b446f7d6064af9806aa6a2da3ce7060980 /lib
parentffcd722c40c4e0e588f94cd429861d75d8645d82 (diff)
downloadredmine-ef9c8797181548df46c093d05a88cc2d9173403e.tar.gz
redmine-ef9c8797181548df46c093d05a88cc2d9173403e.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/wiki_formatting/textile/redcloth3.rb9
1 files changed, 5 insertions, 4 deletions
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