From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 26 Sep 2011 23:14:20 +0000 (+0000)
Subject: (bug 31176) {{SERVERNAME}} doesn't play nice with protocol-relative URLs
X-Git-Tag: 1.31.0-rc.0~27409
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=95e857198b6f754b174a3dbf9b9282d3789003a7;p=lhc%2Fweb%2Fwiklou.git

(bug 31176) {{SERVERNAME}} doesn't play nice with protocol-relative URLs
---

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':