2 files changed, 6 insertions, 8 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1e33e6284a..947e29ea02 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2866,7 +2866,7 @@ function build_url($strip_vars = false)
 	$url_parts = parse_url($page);
 
 	// URL
-	if ($url_parts !== false && !empty($url_parts['scheme']) && !empty($url_parts['host']))
+	if ($url_parts === false || empty($url_parts['scheme']) || empty($url_parts['host']))
 	{
 		$page = $phpbb_root_path . $page;
 	}
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index b2ed11a927..e9fd092b62 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -89,26 +89,24 @@ class path_helper
 	}
 
 	/**
-	* Update a path to the correct relative root path
+	* Update a web path to the correct relative root path
 	*
 	* This replaces $phpbb_root_path . some_url with
-	*	get_web_root_path() . some_url OR if $phpbb_root_path
-	*	is not at the beginning of $path, just prepends the
-	*	web root path
+	*	get_web_root_path() . some_url
 	*
 	* @param string $path The path to be updated
 	* @return string
 	*/
 	public function update_web_root_path($path)
 	{
-		$web_root_path = $this->get_web_root_path($this->symfony_request);
-
 		if (strpos($path, $this->phpbb_root_path) === 0)
 		{
 			$path = substr($path, strlen($this->phpbb_root_path));
+
+			return $this->get_web_root_path() . $path;
 		}
 
-		return $web_root_path . $path;
+		return $path;
 	}
 
 	/**