diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-11-28 21:45:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-11-28 21:45:02 +0000 |
| commit | c5cabfe106c913d709e27ff539de09037f4223b4 (patch) | |
| tree | 24a3eeb95c52c622644212d25d21e3900309cbd6 /lib | |
| parent | 622b3ae61ca8483c988618b561d1158782c0a600 (diff) | |
| download | redmine-c5cabfe106c913d709e27ff539de09037f4223b4.tar.gz redmine-c5cabfe106c913d709e27ff539de09037f4223b4.zip | |
Fixed: Wiki section edit escapes code tags inside pre blocks (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7975 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/formatter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index 0e948cfd5..1122883eb 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -97,7 +97,7 @@ module Redmine 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 @@ -109,6 +109,7 @@ module Redmine 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? |