1 files changed, 36 insertions, 36 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 4d9ca44007..4962d14aef 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/'))
 		{
@@ -194,13 +170,24 @@ class twig extends \phpbb\template\base
 			{
 				$path = $this->phpbb_root_path . trim($directory, '/') . "/{$name}/";
 				$template_path = $path . 'template/';
+				$theme_path = $path . 'theme/';
 
+				$is_valid_dir = false;
 				if (is_dir($template_path))
 				{
+					$is_valid_dir = true;
+					$paths[] = $template_path;
+				}
+				if (is_dir($theme_path))
+				{
+					$is_valid_dir = true;
+					$paths[] = $theme_path;
+				}
+
+				if ($is_valid_dir)
+				{
 					// Add the base style directory as a safe directory
 					$this->twig->getLoader()->addSafeDirectory($path);
-
-					$paths[] = $template_path;
 				}
 			}
 		}
@@ -258,25 +245,38 @@ class twig extends \phpbb\template\base
 						{
 							$ext_style_template_path = $ext_path . $template_dir['ext_path'];
 							$ext_style_path = dirname($ext_style_template_path);
+							$ext_style_theme_path = $ext_style_path . 'theme/';
 						}
 						else
 						{
 							$ext_style_path = $ext_path . 'styles/' . $template_dir['name'] . '/';
 							$ext_style_template_path = $ext_style_path . 'template/';
+							$ext_style_theme_path = $ext_style_path . 'theme/';
 						}
 					}
 					else
 					{
 						$ext_style_path = $ext_path . 'styles/' . $template_dir . '/';
 						$ext_style_template_path = $ext_style_path . 'template/';
+						$ext_style_theme_path = $ext_style_path . 'theme/';
 					}
 
+					$ok = false;
 					if (is_dir($ext_style_template_path))
 					{
+						$ok = true;
+						$paths[] = $ext_style_template_path;
+					}
+					if (is_dir($ext_style_theme_path))
+					{
+						$ok = true;
+						$paths[] = $ext_style_theme_path;
+					}
+
+					if ($ok)
+					{
 						// Add the base style directory as a safe directory
 						$this->twig->getLoader()->addSafeDirectory($ext_style_path);
-
-						$paths[] = $ext_style_template_path;
 					}
 				}