Remove unused fourth parameter for message cache constructor

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index c9f9b73..d00328a 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -27,7 +27,7 @@ class MessageCache {
        // Variable for tracking which variables are loaded
        var $mLoadedLanguages = array();
 
-       function __construct( $memCached, $useDB, $expiry, /*ignored*/ $memcPrefix ) {
+       function __construct( $memCached, $useDB, $expiry ) {
                if ( !$memCached ) {
                        $memCached = wfGetCache( CACHE_NONE );
                }

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index fd4e27d..cfd04d9 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -759,7 +759,7 @@ class ParserTest {
 
                # Make a new message cache
                global $wgMessageCache, $wgMemc;
-               $wgMessageCache = new MessageCache( $wgMemc, true, 3600, '' );
+               $wgMessageCache = new MessageCache( $wgMemc, true, 3600 );
        }
 
        /**

diff --git a/maintenance/tests/UploadFromUrlTestSuite.php b/maintenance/tests/UploadFromUrlTestSuite.php
index 6dd1a25..06bd997 100644 (file)
--- a/maintenance/tests/UploadFromUrlTestSuite.php
+++ b/maintenance/tests/UploadFromUrlTestSuite.php
@@ -54,7 +54,7 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite
 
                $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
                                                                                  array( $messageMemc, $wgUseDatabaseMessages,
-                                                                                                $wgMsgCacheExpiry, wfWikiID() ) );
+                                                                                                $wgMsgCacheExpiry ) );
                if ( $wgStyleDirectory === false ) $wgStyleDirectory   = "$IP/skins";
 
        }