From 95e857198b6f754b174a3dbf9b9282d3789003a7 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 26 Sep 2011 23:14:20 +0000 Subject: [PATCH] (bug 31176) {{SERVERNAME}} doesn't play nice with protocol-relative URLs --- includes/parser/Parser.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index a183101892..1fdbdc9c38 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -2823,10 +2823,8 @@ class Parser { case 'server': return $wgServer; case 'servername': - wfSuppressWarnings(); # May give an E_WARNING in PHP < 5.3.3 - $serverName = parse_url( $wgServer, PHP_URL_HOST ); - wfRestoreWarnings(); - return $serverName ? $serverName : $wgServer; + $serverParts = wfParseUrl( $wgServer, PHP_URL_HOST ); + return $serverParts && isset( $serverParts['host'] ) ? $serverParts['host'] : $wgServer; case 'scriptpath': return $wgScriptPath; case 'stylepath': -- 2.20.1