diff --git a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
index aeee4a6..dd2bed4 100644
--- a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
+++ b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
@@ -44,7 +44,7 @@ public function render(Request $request) {
'#type' => 'contextual_links',
'#contextual_links' => _contextual_id_to_links($id),
);
- $rendered[$id] = drupal_render($element);
+ $rendered[$id] = (string) drupal_render($element);
}
return new JsonResponse($rendered);
diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module
index c8dd4d1..e30301f 100644
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\Markup;
use Drupal\datetime\DateHelper;
use Drupal\node\NodeInterface;
@@ -241,7 +242,7 @@ function template_preprocess_datetime_wrapper(&$variables) {
$variables['description'] = $element['#description'];
}
- $variables['content'] = $element['#children'];
+ $variables['content'] = new Markup($element['#children']);
}
/**
diff --git a/core/modules/filter/templates/filter-guidelines.html.twig b/core/modules/filter/templates/filter-guidelines.html.twig
index 88a3b47..ecf9b94 100644
--- a/core/modules/filter/templates/filter-guidelines.html.twig
+++ b/core/modules/filter/templates/filter-guidelines.html.twig
@@ -20,6 +20,6 @@
*/
#}
-
{{ format.name|escape }}
+ {{ format.name }}
{{ tips }}
diff --git a/core/modules/filter/templates/filter-tips.html.twig b/core/modules/filter/templates/filter-tips.html.twig
index d8f70cb..27a3943 100644
--- a/core/modules/filter/templates/filter-tips.html.twig
+++ b/core/modules/filter/templates/filter-tips.html.twig
@@ -36,7 +36,7 @@
{% if tip.list|length %}
{% for item in tip.list %}
- - {{ item.tip }}
+ - {{ item.tip|raw }}
{% endfor %}
{% endif %}
diff --git a/core/modules/filter/templates/text-format-wrapper.html.twig b/core/modules/filter/templates/text-format-wrapper.html.twig
index f453971..f64fad8 100644
--- a/core/modules/filter/templates/text-format-wrapper.html.twig
+++ b/core/modules/filter/templates/text-format-wrapper.html.twig
@@ -11,8 +11,8 @@
*/
#}
- {{ children }}
+ {{ children|raw }}
{% if description %}
-
{{ description }}
+
{{ description|raw }}
{% endif %}
diff --git a/core/modules/node/templates/node-add-list.html.twig b/core/modules/node/templates/node-add-list.html.twig
index 7323896..29ed28c 100644
--- a/core/modules/node/templates/node-add-list.html.twig
+++ b/core/modules/node/templates/node-add-list.html.twig
@@ -19,7 +19,7 @@
{% for type in types %}
- {{ type.add_link }}
- - {{ type.description }}
+ - {{ type.description|raw }}
{% endfor %}
{% else %}
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index ae1162e..2b47e64 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -88,7 +88,7 @@
{% if display_submitted %}
{% endif %}
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 9ba1a1c..4b1147b 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -10,6 +10,7 @@
use Drupal\Core\Extension\Extension;
use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\Markup;
/**
* Recursively check compatibility.
@@ -58,9 +59,9 @@ function template_preprocess_admin_block_content(&$variables) {
$variables['attributes']['class'][] = 'compact';
}
foreach ($variables['content'] as $key => $item) {
- $variables['content'][$key]['link'] = l($item['title'], $item['link_path'], $item['localized_options']);
+ $variables['content'][$key]['link'] = new Markup(l($item['title'], $item['link_path'], $item['localized_options']));
if (!$compact && isset($item['description'])) {
- $variables['content'][$key]['description'] = Xss::filterAdmin($item['description']);
+ $variables['content'][$key]['description'] = new Markup(Xss::filterAdmin($item['description']));
}
else {
$variables['content'][$key]['description'] = FALSE;
diff --git a/core/modules/system/templates/admin-block-content.html.twig b/core/modules/system/templates/admin-block-content.html.twig
index a49bf10..6670bf9 100644
--- a/core/modules/system/templates/admin-block-content.html.twig
+++ b/core/modules/system/templates/admin-block-content.html.twig
@@ -20,7 +20,7 @@
{% for item in content %}
{{ item.link }}
{% if item.description %}
-
{{ item.description }}
+
{{ item.description|raw }}
{% endif %}
{% endfor %}
diff --git a/core/modules/system/templates/breadcrumb.html.twig b/core/modules/system/templates/breadcrumb.html.twig
index 5f322f9..d36a426 100644
--- a/core/modules/system/templates/breadcrumb.html.twig
+++ b/core/modules/system/templates/breadcrumb.html.twig
@@ -14,7 +14,7 @@
{{ 'You are here'|t }}
{% for item in breadcrumb %}
- - {{ item }}
+ - {{ item|raw }}
{% endfor %}
diff --git a/core/modules/system/templates/container.html.twig b/core/modules/system/templates/container.html.twig
index a643e19..7800b64 100644
--- a/core/modules/system/templates/container.html.twig
+++ b/core/modules/system/templates/container.html.twig
@@ -15,4 +15,4 @@
* @ingroup themeable
*/
#}
-
{{ children }}
+
{{ children|raw }}
diff --git a/core/modules/system/templates/datetime.html.twig b/core/modules/system/templates/datetime.html.twig
index 25ef788..183b834 100644
--- a/core/modules/system/templates/datetime.html.twig
+++ b/core/modules/system/templates/datetime.html.twig
@@ -25,5 +25,4 @@
* @see http://www.w3.org/TR/html5-author/the-time-element.html#attr-time-datetime
*/
#}
-{# @todo Revisit once http://drupal.org/node/1825952 is resolved. #}
-
+
diff --git a/core/modules/system/templates/details.html.twig b/core/modules/system/templates/details.html.twig
index 17ea820..6283dc2 100644
--- a/core/modules/system/templates/details.html.twig
+++ b/core/modules/system/templates/details.html.twig
@@ -17,17 +17,17 @@
#}
{%- if title -%}
- {{ title }}
+ {{ title|raw }}
{%- endif -%}
{%- if description -%}
-
{{ description }}
+
{{ description|raw }}
{%- endif -%}
{%- if children -%}
- {{ children }}
+ {{ children|raw }}
{%- endif -%}
{%- if value -%}
- {{ value }}
+ {{ value|raw }}
{%- endif -%}
diff --git a/core/modules/system/templates/dropbutton-wrapper.html.twig b/core/modules/system/templates/dropbutton-wrapper.html.twig
index ca0ff7e..d92bb6e 100644
--- a/core/modules/system/templates/dropbutton-wrapper.html.twig
+++ b/core/modules/system/templates/dropbutton-wrapper.html.twig
@@ -16,7 +16,7 @@
{% spaceless %}
{% endspaceless %}
diff --git a/core/modules/system/templates/form-element.html.twig b/core/modules/system/templates/form-element.html.twig
index ea4d90f..bf9b76f 100644
--- a/core/modules/system/templates/form-element.html.twig
+++ b/core/modules/system/templates/form-element.html.twig
@@ -43,7 +43,7 @@
{% if prefix is not empty %}
{{ prefix }}
{% endif %}
- {{ children }}
+ {{ children|raw }}
{% if suffix is not empty %}
{{ suffix }}
{% endif %}
@@ -52,7 +52,7 @@
{% endif %}
{% if description.content %}
- {{ description.content }}
+ {{ description.content|raw }}
{% endif %}
diff --git a/core/modules/system/templates/form.html.twig b/core/modules/system/templates/form.html.twig
index 2cd1e95..9bf07f1 100644
--- a/core/modules/system/templates/form.html.twig
+++ b/core/modules/system/templates/form.html.twig
@@ -13,5 +13,5 @@
*/
#}