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;
}
/**
diff --git a/tests/path_helper/web_root_path_test.php b/tests/path_helper/web_root_path_test.php
index 938b58892b..2e1a37e02b 100644
--- a/tests/path_helper/web_root_path_test.php
+++ b/tests/path_helper/web_root_path_test.php
@@ -52,13 +52,18 @@ class phpbb_path_helper_web_root_path_test extends phpbb_test_case
$this->set_phpbb_root_path();
return array(
+ array(
+ 'http://www.test.com/test.php',
+ 'http://www.test.com/test.php',
+ '/',
+ ),
array(
$this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . 'test.php',
),
array(
'test.php',
- $this->phpbb_root_path . 'test.php',
+ 'test.php',
),
array(
$this->phpbb_root_path . $this->phpbb_root_path . 'test.php',
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index 7424af0c93..9ed8bd0947 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -18,8 +18,8 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
// Prepare correct result
$scripts = array(
- '',
- '',
+ '',
+ '',
);
// Run test
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index ab0f4b9ca1..b20d068a64 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -24,51 +24,51 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
*/
array(
array('TEST' => 1),
- '',
+ '',
),
array(
array('TEST' => 2),
- '',
+ '',
),
array(
array('TEST' => 3),
- '',
+ '',
),
array(
array('TEST' => 4),
- '',
+ '',
),
array(
array('TEST' => 6),
- '',
+ '',
),
array(
array('TEST' => 7),
- '',
+ '',
),
array(
array('TEST' => 8),
- '',
+ '',
),
array(
array('TEST' => 9),
- '',
+ '',
),
array(
array('TEST' => 10),
- '',
+ '',
),
array(
array('TEST' => 11),
- '',
+ '',
),
array(
array('TEST' => 12),
- '',
+ '',
),
array(
array('TEST' => 14),
- '',
+ '',
),
array(
array('TEST' => 15),
@@ -84,7 +84,7 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
),
array(
array('TEST' => 18),
- '',
+ '',
),
);
}