Fixme on r57980: Memcached would be bad here, rename variable with wg prefix. Fixes...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 219df38..de8e6d9 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2271,9 +2271,7 @@ function wfSpecialList( $page, $details ) {
  */
 function wfUrlProtocols() {
        global $wgUrlProtocols;
-       
-       // This function is called a lot, cache its return value
-       // TODO: Cache this in memcached instead?
+
        static $retval = null;
        if ( !is_null( $retval ) )
                return $retval;
@@ -2289,7 +2287,6 @@ function wfUrlProtocols() {
        } else {
                $retval = $wgUrlProtocols;
        }
-       
        return $retval;
 }
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 93f92e9..d00d762 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -378,7 +378,7 @@ class Skin extends Linker {
                $vars = array(
                        'skin' => $skinName,
                        'stylepath' => $wgStylePath,
-                       'urlprotocols' => wfUrlProtocols(),
+                       'wgUrlProtocols' => wfUrlProtocols(),
                        'wgArticlePath' => $wgArticlePath,
                        'wgScriptPath' => $wgScriptPath,
                        'wgScriptExtension' => $wgScriptExtension,