Put the suppress & restore warnings calls *around* parse_url() rather than around...

This avoids PHP warning notices when given not-quite-valid input, such as "http://en.wikipedia.org{{localurl:Talk:Wet_Tropics_of_Queensland/Comments|action=edit}}"

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7237d74..3b19ae4 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1946,8 +1946,8 @@ function wfRelativePath( $path, $from ) {
  */
 function wfMakeUrlIndex( $url ) {
        global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
-       $bits = parse_url( $url );
        wfSuppressWarnings();
+       $bits = parse_url( $url );
        wfRestoreWarnings();
        if ( !$bits ) {
                return false;