diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php index b22e523..2bc0d85 100644 --- a/core/lib/Drupal/Core/Template/TwigExtension.php +++ b/core/lib/Drupal/Core/Template/TwigExtension.php @@ -498,7 +498,7 @@ public function renderVar($arg) { } // Optimize for scalars as it is likely they come from the escape filter. - if (is_scalar($arg) || $arg instanceof MarkupInterface) { + if (is_scalar($arg) || $arg instanceof MarkupInterface || $arg instanceof \Twig_Markup) { return $arg; } diff --git a/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/core/lib/Drupal/Core/Template/TwigNodeTrans.php index 00410af..ed783d5 100644 --- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php +++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php @@ -69,8 +69,8 @@ public function compile(\Twig_Compiler $compiler) { foreach ($tokens as $token) { $compiler->string($token->getAttribute('placeholder'))->raw(' => $this->env->getExtension("drupal_core")->renderVar(')->subcompile($token)->raw('), '); } - $compiler->raw(')'); + // Write any options passed. if (!empty($options)) { $compiler->raw(', ')->subcompile($options);