From 67695626967ba3165e8e91f76ab1677a97812426 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Sat, 18 Sep 2021 09:56:56 +1000
Subject: [PATCH] Issue #3233012 by alexpott: Refactor
\Drupal\Core\Render\Element\HtmlTag to not trigger deprecations in PHP 8.1
---
core/lib/Drupal/Core/Render/Element/HtmlTag.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 8105c487f94e..78c477e65f87 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -95,8 +95,15 @@ public static function preRenderHtmlTag($element) {
// Construct all other elements.
else {
$open_tag .= '>';
- $markup = $element['#value'] instanceof MarkupInterface ? $element['#value'] : Xss::filterAdmin($element['#value']);
- $element['#markup'] = Markup::create($markup);
+ if ($element['#value'] === NULL) {
+ $element['#markup'] = '';
+ }
+ elseif ($element['#value'] instanceof MarkupInterface) {
+ $element['#markup'] = $element['#value'];
+ }
+ else {
+ $element['#markup'] = Markup::create(Xss::filterAdmin($element['#value']));
+ }
}
$prefix = isset($element['#prefix']) ? $element['#prefix'] . $open_tag : $open_tag;
$suffix = isset($element['#suffix']) ? $close_tag . $element['#suffix'] : $close_tag;
--
GitLab