From ad4c39b020b52e3a491c6c8d0bb5cecd8febf8da Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 29 May 2024 23:23:42 +0200
Subject: [PATCH] [BUGFIX] Add type cast to string to stdwrap methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The stdWrap options stripHtml and htmlSpecialChars requires the value to
be a string. A typecast forces the string to avoid exceptions.
Resolves: #103085
Releases: main, 12.4
Change-Id: Ia936a19e06fdf954ca3aef442cad34c164e9c54e
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84446
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
.../Classes/ContentObject/ContentObjectRenderer.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index a854c8de238b..8ed02235f2f0 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1879,7 +1879,7 @@ class ContentObjectRenderer implements LoggerAwareInterface
*/
public function stdWrap_stripHtml($content = '')
{
- return strip_tags($content);
+ return strip_tags((string)$content);
}
/**
@@ -1919,9 +1919,9 @@ class ContentObjectRenderer implements LoggerAwareInterface
public function stdWrap_htmlSpecialChars($content = '', $conf = [])
{
if (!empty($conf['htmlSpecialChars.']['preserveEntities'])) {
- $content = htmlspecialchars($content, ENT_COMPAT, 'UTF-8', false);
+ $content = htmlspecialchars((string)$content, ENT_COMPAT, 'UTF-8', false);
} else {
- $content = htmlspecialchars($content);
+ $content = htmlspecialchars((string)$content);
}
return $content;
}
--
GitLab