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
This commit is contained in:
parent
208d2d4090
commit
6f5ffce799
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -113,7 +113,7 @@ RAW
|
|||
expected = <<-EXPECTED
|
||||
<p>John said:</p>
|
||||
<blockquote>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.<br />
|
||||
Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
|
||||
<ul>
|
||||
<li>Donec odio lorem,</li>
|
||||
|
|
Loading…
Reference in New Issue