Now that wfParseUrl() can handle protocol-relative URLs, make wfExpandUrl() work...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 12b1309..8aa13e7 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -437,7 +437,7 @@ function wfExpandUrl( $url ) {
        global $wgServer;
        if( substr( $url, 0, 2 ) == '//' ) {
                $bits = wfParseUrl( $wgServer );
-               $scheme = $bits ? $bits['scheme'] : 'http';
+               $scheme = $bits && $bits['scheme'] !== '' ? $bits['scheme'] : 'http';
                return $scheme . ':' . $url;
        } elseif( substr( $url, 0, 1 ) == '/' ) {
                return $wgServer . $url;