Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to 1526 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1532 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang committed 2008-06-14 12:21:52 +00:00
1 parent 9c5ec2974d
commit 2af910e8e6
9 files changed
+18 -8

No files matched your search

+1 -1
View File
@@ -1131,7 +1131,7 @@ class RedCloth < String
end
end
ALLOWED_TAGS = %w(redpre pre code)
ALLOWED_TAGS = %w(redpre pre code notextile)
def escape_html_tags(text)
text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }