kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: Wiki section edit escapes code tags inside pre blocks (#9673).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7975 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-11-28 21:45:02 +00:00
parent 622b3ae61c
commit c5cabfe106
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/wiki_formatting/textile/formatter.rb
View File

@ -97,7 +97,7 @@ module Redmine
end end
end end
sections = [before.strip, s.strip, after.strip] sections = [before.strip, s.strip, after.strip]
sections.each {|section| smooth_offtags section} sections.each {|section| smooth_offtags_without_code_highlighting section}
sections sections
end end
@ -109,6 +109,7 @@ module Redmine
text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
end end
alias :smooth_offtags_without_code_highlighting :smooth_offtags
# Patch to add code highlighting support to RedCloth # Patch to add code highlighting support to RedCloth
def smooth_offtags( text ) def smooth_offtags( text )
unless @pre_list.empty? unless @pre_list.empty?

5
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
View File

@ -279,6 +279,11 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.",
# 1 # 1
"h2. Heading 2 "h2. Heading 2
<pre><code class=\"ruby\">
def foo
end
</code></pre>
Morbi facilisis accumsan orci non pharetra. Morbi facilisis accumsan orci non pharetra.
<pre> <pre>