Merged r1930 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.7-stable@2173 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-12-24 11:35:57 +00:00
parent bf45264131
commit de86f4b965
2 changed files with 4 additions and 2 deletions

View File

@@ -1027,7 +1027,7 @@ class RedCloth < String
else
htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
line = "<redpre##{ @pre_list.length }>"
@pre_list << "#{ $3 }#{ aftertag }"
@pre_list << "#{ $3.gsub(/<(#{ OFFTAGS })[^>]*>/, '<\\1>') }#{ aftertag }"
end
elsif $1 and codepre > 0
if codepre - used_offtags.length > 0