Maintain backwards-compatibility in $wgUrlProtocols, so that wikis don't get transfor...

http://jan.moesen.nu/media/images/screenshots/2006/20060228-mediawiki-1.6a-fubar.png

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f5e6486..0850cb9 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1713,11 +1713,17 @@ function in_string( $needle, $str ) {
 function wfUrlProtocols() {
        global $wgUrlProtocols;
 
-       $protocols = array();
-       foreach ($wgUrlProtocols as $protocol)
-               $protocols[] = preg_quote( $protocol, '/' );
-
-       return implode( '|', $protocols );
+       // Support old-style $wgUrlProtocols strings, for backwards compatibility 
+       // with LocalSettings files from 1.5
+       if ( is_array( $wgUrlProtocols ) ) {
+               $protocols = array();
+               foreach ($wgUrlProtocols as $protocol)
+                       $protocols[] = preg_quote( $protocol, '/' );
+
+               return implode( '|', $protocols );
+       } else {
+               return $wgUrlProtocols;
+       }
 }
 
 /**