diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-14 20:35:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-14 20:35:36 +0000 |
| commit | 6f5ffce7993923bf6568b1d756b7a101f7b75028 (patch) | |
| tree | d74a15adbc132ae19a91567216048ff7f000f0d5 /lib | |
| parent | 208d2d4090878c34e0132d1be08aa7f1587602d1 (diff) | |
| download | redmine-6f5ffce7993923bf6568b1d756b7a101f7b75028.tar.gz redmine-6f5ffce7993923bf6568b1d756b7a101f7b75028.zip | |
Fixed: line breaks are ignored in quoted text (#6148).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5133 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcloth3.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/formatter.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index 848aa7042..f4c624437 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -296,11 +296,11 @@ class RedCloth3 < String rip_offtags text no_textile text escape_html_tags text + # need to do this before #hard_break and #blocks + block_textile_quotes text unless @lite_mode hard_break text unless @lite_mode refs text - # need to do this before text is split by #blocks - block_textile_quotes text blocks text end inline text diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index 88d52a6c2..a32e648ec 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -43,7 +43,7 @@ module Redmine # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet. # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a> def hard_break( text ) - text.gsub!( /(.)\n(?!\n|\Z|>| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks + text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks end # Patch to add code highlighting support to RedCloth |