2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php
index 961783e635..7d0b618be3 100644
--- a/phpBB/includes/template/locator.php
+++ b/phpBB/includes/template/locator.php
@@ -60,6 +60,14 @@ class phpbb_template_locator
 
 	private $orig_tpl_inherits_id;
 
+	private $user;
+
+	public function __construct($phpbb_root_path, $user)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->user = $user;
+	}
+
 	/**
 	* Set template location.
 	* @param string $style_name Name of style from which templates are to be taken
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 4ac15ae500..2f360e4df4 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -81,7 +81,7 @@ class phpbb_template
 		$this->phpEx = $phpEx;
 		$this->config = $config;
 		$this->user = $user;
-		$this->locator = new phpbb_template_locator();
+		$this->locator = new phpbb_template_locator($phpbb_root_path, $user);
 	}
 
 	/**