Commit d10622a9 authored by webchick's avatar webchick

Issue #2553969 by alexpott, dawehner, xjm: Use \Twig_Markup in...

Issue #2553969 by alexpott, dawehner, xjm: Use \Twig_Markup in twig_drupal_join_filter() since it is part of Twig and should not pollute the safe list
parent fa2724a4
......@@ -164,8 +164,8 @@ function twig_without($element) {
* This value is expected to be safe for output and user provided data should
* never be used as a glue.
*
* @return \Drupal\Component\Utility\SafeMarkup|string
* The imploded string, which is now also marked as safe.
* @return \Twig_Markup
* The imploded string, which is wrapped in \Twig_Markup because it is safe.
*/
function twig_drupal_join_filter($value, $glue = '') {
$separator = '';
......@@ -175,5 +175,5 @@ function twig_drupal_join_filter($value, $glue = '') {
$separator = $glue;
}
return SafeMarkup::set($output);
return new \Twig_Markup($output, 'UTF-8');
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment