jro_apps/redmine Commit - r3468:7621463acb1c

Do not html escape code that is going to be highlighted (#2985, #3359)....

Jean-Philippe Lang -

r3468:7621463acb1c

parent child

Context file:

r3468:7621463acb1c

Collapse all files

lib/redcloth3.rb +7 -3

                         codepre, used_offtags = 0, {}
                         text.gsub!( OFFTAG_MATCH ) do |line|
                             if $3
-                                offtag, aftertag = $4, $5
+                                first, offtag, aftertag = $3, $4, $5
                                 codepre += 1
                                 used_offtags[offtag] = true
                                 if codepre - used_offtags.length > 0
                                     @pre_list.last << line
                                     line = ""
                                 else
-                                    htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag
+                                    ### htmlesc is disabled between CODE tags which will be parsed with highlighter
+                                    ### Regexp in formatter.rb is : /<code\s+class="(\w+)">\s?(.+)/m
+                                    ### NB: some changes were made not to use $N variables, because we use "match"
+                                    ###   and it breaks following lines
+                                    htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag && !first.match(/<code\s+class="(\w+)">/)
                                     line = "<redpre##{ @pre_list.length }>"
-                                    $3.match(/<#{ OFFTAGS }([^>]*)>/)
+                                    first.match(/<#{ OFFTAGS }([^>]*)>/)
                                     tag = $1
                                     $2.to_s.match(/(class\=\S+)/i)
                                     tag << " #{$1}" if $1

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

                           content = @pre_list[$1.to_i]
                           if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
                             content = "<code class=\"#{$1} CodeRay\">" +
-                              CodeRay.scan($2, $1.downcase).html(:escape => false, :line_numbers => :inline)
+                              CodeRay.scan($2, $1.downcase).html(:line_numbers => :inline)
                           end
                           content
                         end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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