From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 10 Jun 2019 11:49:48 +0000 (+0000)
Subject: Merged r18247 to 3.4-stable (#31520).
X-Git-Tag: 3.4.11~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=90ee0d29027e4487f2171661c9d4e893b3067749;p=redmine.git

Merged r18247 to 3.4-stable (#31520).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18249 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index fc71d5929..5716e7d5c 100644
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -1213,7 +1213,13 @@ class RedCloth3 < String
     
     ALLOWED_TAGS = %w(redpre pre code kbd notextile)
     def escape_html_tags(text)
-      text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
+        text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) do |m|
+            if ALLOWED_TAGS.include?($2) && $3.present?
+                "<#{$1}#{$3}"
+            else
+                "&lt;#{$1}#{'&gt;' unless $3.blank?}"
+            end
+        end
     end
 end