jro_apps/redmine Commit - r5013:6f5ffce79939

Fixed: line breaks are ignored in quoted text (#6148)....

Jean-Philippe Lang -

r5013:6f5ffce79939

parent child

Context file:

r5013:6f5ffce79939

lib/redcloth3.rb +2 -2

                     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

lib/redmine/wiki_formatting/textile/formatter.rb +1 -1

                     # 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

test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +1 -1

                 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>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages