From 872e567008ad678cc3de97571396ea10e5209944 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Wed, 20 Jan 2016 22:43:25 +0100
Subject: [PATCH] [TASK] RTE Parser - store allowed tag list in class property
Instead of having a local variable list, the code is cleaned
up by moving the allowed tags list into the class property.
No change in functionality is made.
Resolves: #72852
Releases: master
Change-Id: I58e26f02a58e5feb2096caa44c6a8538d59ea9b3
Reviewed-on: https://review.typo3.org/46121
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
---
typo3/sysext/core/Classes/Html/RteHtmlParser.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index 01d34bbe1578..bfdd4bd16c07 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -33,6 +33,12 @@ class RteHtmlParser extends HtmlParser
*/
public $blockElementList = 'DIV,TABLE,BLOCKQUOTE,PRE,UL,OL,H1,H2,H3,H4,H5,H6,ADDRESS,DL,DD,HEADER,SECTION,FOOTER,NAV,ARTICLE,ASIDE';
+ /**
+ * List of all tags that are allowed by default
+ * @var string
+ */
+ protected $defaultAllowedTagsList = 'b,i,u,a,img,br,div,center,pre,font,hr,sub,sup,p,strong,em,li,ul,ol,blockquote,strike,span';
+
/**
* Set this to the pid of the record manipulated by the class.
*
@@ -1011,8 +1017,7 @@ class RteHtmlParser extends HtmlParser
} else {
// Default is to get allowed/denied tags from internal array of processing options:
// Construct default list of tags to keep:
- $typoScript_list = 'b,i,u,a,img,br,div,center,pre,font,hr,sub,sup,p,strong,em,li,ul,ol,blockquote,strike,span';
- $keepTags = array_flip(GeneralUtility::trimExplode(',', $typoScript_list . ',' . strtolower($this->procOptions['allowTags']), true));
+ $keepTags = array_flip(GeneralUtility::trimExplode(',', $this->defaultAllowedTagsList . ',' . strtolower($this->procOptions['allowTags']), true));
// For tags to deny, remove them from $keepTags array:
$denyTags = GeneralUtility::trimExplode(',', $this->procOptions['denyTags'], true);
foreach ($denyTags as $dKe) {
--
GitLab