From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 5 Aug 2010 18:26:13 +0000 (+0000)
Subject: Remove unused fourth parameter for message cache constructor
X-Git-Tag: 1.31.0-rc.0~35698
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=ed774b174d9c6d34431d454f765825b92d395f80;p=lhc%2Fweb%2Fwiklou.git

Remove unused fourth parameter for message cache constructor
---

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index c9f9b7365f..d00328a931 100644
--- 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 fd4e27d0e1..cfd04d9a8b 100644
--- 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 6dd1a2581e..06bd99779e 100644
--- 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";
 
 	}