diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-14 09:05:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-14 09:05:58 +0000 |
| commit | 7621463acb1c687680e1bdf5923255d980692845 (patch) | |
| tree | 7a87d3abd40a266c5cf68287fc95378373e6ebbb /lib/redmine | |
| parent | 2f5c17a0f6eac2f50e61053e06672a1e83d4f598 (diff) | |
| download | redmine-7621463acb1c687680e1bdf5923255d980692845.tar.gz redmine-7621463acb1c687680e1bdf5923255d980692845.zip | |
Do not html escape code that is going to be highlighted (#2985, #3359).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3582 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/formatter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index ab66ba5b7..2010986f5 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -54,7 +54,7 @@ module Redmine 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 |