diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 739340c3c4a..3bdf6452b6a 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -656,14 +656,11 @@ class WebRequest { } if( $base[0] == '/' ) { - if( isset( $base[1] ) && $base[1] == '/' ) { /* More than one slash will look like it is protocol relative */ - return preg_replace( '!//*!', '/', $base ); - } - - return $base; + // More than one slash will look like it is protocol relative + return preg_replace( '!^/+!', '/', $base ); } else { // We may get paths with a host prepended; strip it. - return preg_replace( '!^[^:]+://[^/]+/!', '/', $base ); + return preg_replace( '!^[^:]+://[^/]+/+!', '/', $base ); } }