5 files changed, 54 insertions, 37 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index 67dbd7b357..4729685459 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -152,6 +152,12 @@ class asset
 	*/
 	public function set_path($path, $urlencode = false)
 	{
+		// Since 1.7.0 Twig returns the real path of the file. We need it to be relative to the working directory.
+		$real_root_path = realpath('.') . DIRECTORY_SEPARATOR;
+		if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) {
+			$path = str_replace('\\', '/', substr($path, strlen($real_root_path)));
+		}
+
 		if ($urlencode)
 		{
 			$paths = explode('/', $path);
@@ -161,6 +167,7 @@ class asset
 			}
 			$path = implode('/', $paths);
 		}
+
 		$this->components['path'] = $path;
 	}
 
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index 476ffd935e..0ba7a265e4 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -21,6 +21,9 @@ class environment extends \Twig_Environment
 	/** @var \phpbb\path_helper */
 	protected $phpbb_path_helper;
 
+	/** @var \Symfony\Component\DependencyInjection\ContainerInterface */
+	protected $container;
+
 	/** @var \phpbb\extension\manager */
 	protected $extension_manager;
 
@@ -38,24 +41,49 @@ class environment extends \Twig_Environment
 	*
 	* @param \phpbb\config\config $phpbb_config The phpBB configuration
 	* @param \phpbb\path_helper $path_helper phpBB path helper
+	* @param \Symfony\Component\DependencyInjection\ContainerInterface $container The dependency injection container
+	* @param string $cache_path The path to the cache directory
 	* @param \phpbb\extension\manager $extension_manager phpBB extension manager
 	* @param \Twig_LoaderInterface $loader Twig loader interface
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \Symfony\Component\DependencyInjection\ContainerInterface $container, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 
 		$this->phpbb_path_helper = $path_helper;
 		$this->extension_manager = $extension_manager;
+		$this->container = $container;
 
 		$this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path();
 		$this->web_root_path = $this->phpbb_path_helper->get_web_root_path();
 
+		$options = array_merge(array(
+			'cache'			=> (defined('IN_INSTALL')) ? false : $cache_path,
+			'debug'			=> defined('DEBUG'),
+			'auto_reload'	=> (bool) $this->phpbb_config['load_tplcompile'],
+			'autoescape'	=> false,
+		), $options);
+
 		return parent::__construct($loader, $options);
 	}
 
 	/**
+	* {@inheritdoc}
+	*/
+	public function getLexer()
+	{
+		if (null === $this->lexer)
+		{
+			$this->lexer = $this->container->get('template.twig.lexer');
+			$this->lexer->set_environment($this);
+		}
+
+		return $this->lexer;
+	}
+
+
+	/**
 	* Get the list of enabled phpBB extensions
 	*
 	* Used in EVENT node
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 3a983491b9..14d1258c09 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -71,6 +71,7 @@ class extension extends \Twig_Extension
 	{
 		return array(
 			new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
+			// @deprecated 3.2.0 Uses twig's JS escape method instead of addslashes
 			new \Twig_SimpleFilter('addslashes', 'addslashes'),
 		);
 	}
@@ -177,7 +178,7 @@ class extension extends \Twig_Extension
 			return $context_vars['L_' . $key];
 		}
 
-		// LA_ is transformed into lang(\'$1\')|addslashes, so we should not
+		// LA_ is transformed into lang(\'$1\')|escape('js'), so we should not
 		// need to check for it
 
 		return call_user_func_array(array($this->user, 'lang'), $args);
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index c5dc7273ba..f1542109a4 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -15,6 +15,11 @@ namespace phpbb\template\twig;
 
 class lexer extends \Twig_Lexer
 {
+	public function set_environment(\Twig_Environment $env)
+	{
+		$this->env = $env;
+	}
+
 	public function tokenize($code, $filename = null)
 	{
 		// Our phpBB tags
@@ -112,9 +117,9 @@ class lexer extends \Twig_Lexer
 		// Appends any filters after lang()
 		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2 }}', $code);
 
-		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
-		// Appends any filters after lang(), but before addslashes
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
+		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|escape('js') }}
+		// Appends any filters after lang(), but before escape('js')
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2|escape(\'js\') }}', $code);
 
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
 		// Appends any filters
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index bd754d9bbd..605d37e954 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -78,9 +78,12 @@ class twig extends \phpbb\template\base
 	* @param \phpbb\config\config $config
 	* @param \phpbb\user $user
 	* @param \phpbb\template\context $context template context
+	* @param \phpbb\template\twig\environment $twig_environment
+	* @param string $cache_path
+	* @param array|\ArrayAccess $extensions
 	* @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked
 	*/
-	public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null)
+	public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\template\twig\environment $twig_environment, $cache_path, $extensions = array(), \phpbb\extension\manager $extension_manager = null)
 	{
 		$this->path_helper = $path_helper;
 		$this->phpbb_root_path = $path_helper->get_phpbb_root_path();
@@ -89,41 +92,14 @@ class twig extends \phpbb\template\base
 		$this->user = $user;
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
+		$this->cachepath = $cache_path;
+		$this->twig = $twig_environment;
 
-		$this->cachepath = $this->phpbb_root_path . 'cache/twig/';
-
-		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
-		$loader = new \phpbb\template\twig\loader('');
-
-		$this->twig = new \phpbb\template\twig\environment(
-			$this->config,
-			$this->path_helper,
-			$this->extension_manager,
-			$loader,
-			array(
-				'cache'			=> (defined('IN_INSTALL')) ? false : $this->cachepath,
-				'debug'			=> defined('DEBUG'),
-				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
-				'autoescape'	=> false,
-			)
-		);
-
-		$this->twig->addExtension(
-			new \phpbb\template\twig\extension(
-				$this->context,
-				$this->user
-			)
-		);
-
-		if (defined('DEBUG'))
+		foreach ($extensions as $extension)
 		{
-			$this->twig->addExtension(new \Twig_Extension_Debug());
+			$this->twig->addExtension($extension);
 		}
 
-		$lexer = new \phpbb\template\twig\lexer($this->twig);
-
-		$this->twig->setLexer($lexer);
-
 		// Add admin namespace
 		if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/'))
 		{