From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 22 Nov 2016 21:02:10 +0000 (-0800)
Subject: Make cache object mandatory for MessageCache
X-Git-Tag: 1.31.0-rc.0~4792^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=8ae2c96b14884af88c4f588aa7516ee65f25202f;p=lhc%2Fweb%2Fwiklou.git

Make cache object mandatory for MessageCache

The only caller is MessageCache::singleton().

Change-Id: Ifcf0d458b9c691d6dce90b56b2f0f7d35e6ddef3
---

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 1bcab41fdb..3f78d9a4c8 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -153,13 +153,9 @@ class MessageCache {
 	 * @param bool $useDB
 	 * @param int $expiry Lifetime for cache. @see $mExpiry.
 	 */
-	function __construct( $memCached, $useDB, $expiry ) {
+	function __construct( BagOStuff $memCached, $useDB, $expiry ) {
 		global $wgUseLocalMessageCache;
 
-		if ( !$memCached ) {
-			$memCached = wfGetCache( CACHE_NONE );
-		}
-
 		$this->mMemc = $memCached;
 		$this->mDisable = !$useDB;
 		$this->mExpiry = $expiry;