2 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index 7c322cd971..2b10dd8848 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -19,13 +19,18 @@ class phpbb_template_asset
 {
 	protected $components = array();
 
+	/** @var phpbb_filesystem **/
+	protected $phpbb_filesystem;
+
 	/**
 	* Constructor
 	*
 	* @param string $url URL
 	*/
-	public function __construct($url)
+	public function __construct($url, phpbb_filesystem $phpbb_filesystem)
 	{
+		$this->phpbb_filesystem = $phpbb_filesystem;
+
 		$this->set_url($url);
 	}
 
@@ -112,7 +117,7 @@ class phpbb_template_asset
 	*/
 	public function get_url()
 	{
-		return $this->join_url($this->components);
+		return $this->phpbb_filesystem->update_web_root_path($this->join_url($this->components));
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 2dcd2003a3..8629395898 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -33,11 +33,11 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
+			->write("\$asset = new phpbb_template_asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-				->write("\$local_file = \$this->getEnvironment()->get_web_root_path() . \$asset_path;\n")
+				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
 				->write("if (!file_exists(\$local_file)) {\n")
 				->indent()
 					->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")