diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index cbd9ca8..c30402e 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -511,7 +511,7 @@ protected function doRender(&$elements, $is_root_call = FALSE) { $prefix = isset($elements['#prefix']) ? $this->xssFilterAdminIfUnsafe($elements['#prefix']) : ''; $suffix = isset($elements['#suffix']) ? $this->xssFilterAdminIfUnsafe($elements['#suffix']) : ''; - $elements['#markup'] = $prefix . $elements['#children'] . $suffix; + $elements['#markup'] = SafeString::create($prefix . $elements['#children'] . $suffix); // We've rendered this element (and its subtree!), now update the context. $context->update($elements); @@ -546,7 +546,7 @@ protected function doRender(&$elements, $is_root_call = FALSE) { $context->bubble(); $elements['#printed'] = TRUE; - return SafeString::create($elements['#markup']); + return $elements['#markup']; } /** diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index 46fb11e..b356034 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -1139,7 +1139,7 @@ public function advancedRender(ResultRow $values) { else { $value = $this->render($values); if (is_array($value)) { - $value = (string) $this->getRenderer()->render($value); + $value = $this->getRenderer()->render($value); } $this->last_render = $value; $this->original_value = $value; @@ -1170,7 +1170,7 @@ public function advancedRender(ResultRow $values) { } if (is_array($value)) { - $value = (string) $this->getRenderer()->render($value); + $value = $this->getRenderer()->render($value); } // This happens here so that renderAsLink can get the unaltered value of // this field as a token rather than the altered value.