Add twigAutoescape config setting

aleksip · Jan 7, 2016 · 4fcf3c1 · 4fcf3c1
1 parent 3e28821
commit 4fcf3c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -35,6 +35,7 @@
 				"lineageMatchKey": 2,
 				"patternExtension": "twig",
 				"twigDebug": false,
+				"twigAutoescape": "html",
 				"twigDefaultDateFormat": "",
 				"twigDefaultIntervalFormat": "",
 				"twigMacroExt": "macro.twig",
@@ -45,4 +46,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php b/src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php
@@ -28,6 +28,7 @@ public function __construct($options = array()) {
 
 		// set-up default vars
 		$twigDebug            = Config::getOption("twigDebug");
+		$twigAutoescape       = Config::getOption("twigAutoescape");
 
 		// set-up the loader list
 		$loaders              = array();
@@ -56,7 +57,7 @@ public function __construct($options = array()) {
 
 		// set-up Twig
 		$twigLoader           = new \Twig_Loader_Chain($loaders);
-		$this->instance       = new \Twig_Environment($twigLoader, array("debug" => $twigDebug));
+		$this->instance       = new \Twig_Environment($twigLoader, array("debug" => $twigDebug, "autoescape" => $twigAutoescape));
 
 		// customize Twig
 		$this->instance       = TwigUtil::loadFilters($this->instance);