diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-11-11 07:35:44 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-11-11 07:35:44 +0000 |
| commit | f2e03946a5cc216b3f6c01084801ad1373ef83cc (patch) | |
| tree | 5c33bec5869147227546ea7993c22d8aeed0f02e /lib/redcloth3.rb | |
| parent | 5ef6f243b1350358335df0cc958bbc7076c639a1 (diff) | |
| download | redmine-f2e03946a5cc216b3f6c01084801ad1373ef83cc.tar.gz redmine-f2e03946a5cc216b3f6c01084801ad1373ef83cc.zip | |
Merged r14863 (#6969).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14866 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redcloth3.rb')
| -rw-r--r-- | lib/redcloth3.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index dc1058026..31a558799 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}" : "<#{$1}#{'>' unless $3.blank?}" } + text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "<#{$1}#{'>' unless $3.blank?}" } end end |