aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/asset.php
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /phpBB/phpbb/template/asset.php
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.gz
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.bz2
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.xz
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'phpBB/phpbb/template/asset.php')
-rw-r--r--phpBB/phpbb/template/asset.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index cb00f16549..d6b46234f0 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -45,13 +45,6 @@ class asset
*/
public function set_url($url)
{
- if (version_compare(PHP_VERSION, '5.4.7') < 0 && substr($url, 0, 2) === '//')
- {
- // Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
- $this->components = parse_url('http:' . $url);
- $this->components['scheme'] = '';
- return;
- }
$this->components = parse_url($url);
}