Merge branch 'twig-autoescape' of https://github.com/aleksip/patternengine-php-twig into hotfix-prs

Author: dmolsen

composer.json

@@ -35,6 +35,7 @@
 				"lineageMatchKey": 3,
 				"patternExtension": "twig",
 				"twigDebug": false,
+				"twigAutoescape": "html",
 				"twigDefaultDateFormat": "",
 				"twigDefaultIntervalFormat": "",
 				"twigMacroExt": "macro.twig",

src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php

@@ -29,6 +29,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();
@@ -57,7 +58,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);