jro_apps/redmine Commit - r7855:c5cabfe106c9

Fixed: Wiki section edit escapes code tags inside pre blocks (#9673)....

Jean-Philippe Lang -

r7855:c5cabfe106c9

parent child

Context file:

r7855:c5cabfe106c9

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

                          end
                        end
                        sections = [before.strip, s.strip, after.strip]
-                       sections.each {|section| smooth_offtags section}
+                       sections.each {|section| smooth_offtags_without_code_highlighting section}
                        sections
                      end
                        text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
                      end
+                     alias :smooth_offtags_without_code_highlighting :smooth_offtags
                      # Patch to add code highlighting support to RedCloth
                      def smooth_offtags( text )
                        unless @pre_list.empty?

test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +5 0

                # 1
              "h2. Heading 2
+             <pre><code class=\"ruby\">
+               def foo
+               end
+             </code></pre>
              Morbi facilisis accumsan orci non pharetra.
              <pre>

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