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
This commit is contained in:
Go MAEDA
2020-02-04 04:44:04 +00:00
parent 2f99111be2
commit 5278efdbee

View File

@@ -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