From: Go MAEDA <maeda@farend.jp>
Date: Tue, 4 Feb 2020 04:44:04 +0000 (+0000)
Subject: Merged r19480 from trunk to 4.1-stable (#32477).
X-Git-Tag: 4.1.1~46
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5278efdbee68708e68c6aa044ae9a8be318683d9;p=redmine.git

Merged r19480 from trunk to 4.1-stable (#32477).


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

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index e4553e48a..8b1061da9 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -93,7 +93,7 @@ module Redmine
           </style>'
 
           # Strip {{toc}} tags
-          txt = txt.gsub(/<p>\{\{([<>]?)toc\}\}<\/p>/i, '')
+          txt = txt.gsub(/<p>\{\{((<|&lt;)|(>|&gt;))?toc\}\}<\/p>/i, '')
           writeHTMLCell(w, h, x, y, css_tag + txt, border, ln, fill)
         end