summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-11-11 07:34:15 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-11-11 07:34:15 +0000
commit868d949f47c2767f2d8943edf530dfbc9d00fb73 (patch)
treeb185c752a67a7e748cb262897075495ca20c5681 /lib
parentd9a3e7e258364d5b7d87fe8726a61bff8c0e317c (diff)
downloadredmine-868d949f47c2767f2d8943edf530dfbc9d00fb73.tar.gz
redmine-868d949f47c2767f2d8943edf530dfbc9d00fb73.zip
Reverts r14812 (#6969).
git-svn-id: http://svn.redmine.org/redmine/trunk@14863 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redcloth3.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index 20cccac5b..f9c9054b8 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1202,7 +1202,7 @@ class RedCloth3 < String
ALLOWED_TAGS = %w(redpre pre code notextile)
def escape_html_tags(text)
- text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)?(>?)}) {|m| $2 && ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
+ text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
end
end