jro_apps/redmine Commit - r1899:2e7e26fbb4c8

Fixes html escaping....

Jean-Philippe Lang -

r1899:2e7e26fbb4c8

parent child

Context file:

r1899:2e7e26fbb4c8

lib/redcloth3.rb +3 -3

                                 codepre += 1
                                 used_offtags[offtag] = true
                                 if codepre - used_offtags.length > 0
-                                    htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
+                                    htmlesc( line, :NoQuotes )
                                     @pre_list.last << line
                                     line = ""
                                 else
-                                    htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
+                                    htmlesc( aftertag, :NoQuotes ) if aftertag
                                     line = "<redpre##{ @pre_list.length }>"
                                     @pre_list << "#{ $3 }#{ aftertag }"
                                 end
                             elsif $1 and codepre > 0
                                 if codepre - used_offtags.length > 0
-                                    htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
+                                    htmlesc( line, :NoQuotes )
                                     @pre_list.last << line
                                     line = ""
                                 end

test/unit/helpers/application_helper_test.rb +1 0

                 to_test = {
                   "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
                   "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+                  "<notextile>this is <tag>a tag</tag></notextile>" => "this is &lt;tag&gt;a tag&lt;/tag&gt;"
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end

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