From af0ebfea5cae258b67e7ee1f1f5f878ae8d75e3f Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Thu, 6 Aug 2015 12:51:08 +0100
Subject: [PATCH] Issue #2501455 by Cottser, alexpott, akalata: Remove
SafeMarkup::set() in drupal_render_children() and replace it with SafeString
---
core/includes/common.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index cf4bbb6bb3e8..7d33f07a37b3 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -22,6 +22,7 @@
use Drupal\Core\Asset\AttachedAssets;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Render\SafeString;
use Drupal\Core\Render\Renderer;
use Drupal\Core\Site\Settings;
use Drupal\Core\Url;
@@ -1084,8 +1085,9 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
* can be passed in to save another run of
* \Drupal\Core\Render\Element::children().
*
- * @return string
+ * @return string|\Drupal\Component\Utility\SafeStringInterface
* The rendered HTML of all children of the element.
+ *
* @see drupal_render()
*/
function drupal_render_children(&$element, $children_keys = NULL) {
@@ -1098,7 +1100,7 @@ function drupal_render_children(&$element, $children_keys = NULL) {
$output .= drupal_render($element[$key]);
}
}
- return SafeMarkup::set($output);
+ return SafeString::create($output);
}
/**
--
GitLab