mirror of
https://github.com/redmine/redmine.git
synced 2026-05-05 14:05:36 +02:00
Merged r19333 from trunk to 3.3-stable (#25742)
Filter all possibly class values on code tags in Textile. Contributed by Holger Just from Planio. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@19337 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -120,9 +120,10 @@ module Redmine
|
||||
## replace <pre> content
|
||||
text.gsub!(/<redpre#(\d+)>/) do
|
||||
content = @pre_list[$1.to_i]
|
||||
if content.match(/<code\s+class=["'](\w+)["']>\s?(.+)/m)
|
||||
language = $1
|
||||
text = $2
|
||||
# This regex must match any data produced by RedCloth3#rip_offtags
|
||||
if content.match(/<code\s+class=(?:"([^"]+)"|'([^']+)')>\s?(.*)/m)
|
||||
language = $1 || $2
|
||||
text = $3
|
||||
if Redmine::SyntaxHighlighting.language_supported?(language)
|
||||
content = "<code class=\"#{language} syntaxhl\">" +
|
||||
Redmine::SyntaxHighlighting.highlight_by_language(text, language)
|
||||
|
||||
Reference in New Issue
Block a user