From 86bc1cefe6783416faf2bea9047b66766b9d1a85 Mon Sep 17 00:00:00 2001 From: xjm Date: Sun, 13 Sep 2015 14:40:36 -0500 Subject: [PATCH] Issue #2567139 by Cottser, stefan.r, joelpittet: Twig autoescape default strategy deprecation error triggered on every page load --- core/lib/Drupal/Core/Template/TwigEnvironment.php | 2 +- core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php index 6c5aaa3783..cb4df8576d 100644 --- a/core/lib/Drupal/Core/Template/TwigEnvironment.php +++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php @@ -82,7 +82,7 @@ public function __construct($root, CacheBackendInterface $cache, $twig_extension 'auto_reload' => NULL, ); // Ensure autoescaping is always on. - $options['autoescape'] = TRUE; + $options['autoescape'] = 'html'; $this->loader = $loader; parent::__construct($this->loader, $options); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index 37c7255522..3e78e911dd 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -33,7 +33,7 @@ public function testEscaping($template, $expected) { $twig = new \Twig_Environment(NULL, array( 'debug' => TRUE, 'cache' => FALSE, - 'autoescape' => TRUE, + 'autoescape' => 'html', 'optimizations' => 0 )); $twig->addExtension((new TwigExtension($renderer))->setUrlGenerator($this->getMock('Drupal\Core\Routing\UrlGeneratorInterface'))); @@ -113,7 +113,7 @@ public function testSafeStringEscaping() { $twig = new \Twig_Environment(NULL, array( 'debug' => TRUE, 'cache' => FALSE, - 'autoescape' => TRUE, + 'autoescape' => 'html', 'optimizations' => 0 )); $twig_extension = new TwigExtension($renderer); -- GitLab