Unverified Commit 67695626 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3233012 by alexpott: Refactor \Drupal\Core\Render\Element\HtmlTag to...

Issue #3233012 by alexpott: Refactor \Drupal\Core\Render\Element\HtmlTag to not trigger deprecations in PHP 8.1
parent 4ce6de63
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -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;