jenkins-bot has submitted this change and it was merged.

Change subject: Make cache object mandatory for MessageCache
......................................................................


Make cache object mandatory for MessageCache

The only caller is MessageCache::singleton().

Change-Id: Ifcf0d458b9c691d6dce90b56b2f0f7d35e6ddef3
---
M includes/cache/MessageCache.php
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 1bcab41..3f78d9a 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -153,12 +153,8 @@
         * @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;

-- 
To view, visit https://gerrit.wikimedia.org/r/322966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcf0d458b9c691d6dce90b56b2f0f7d35e6ddef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to