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