From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Aug 2018 06:03:27 +0000 (-0700)
Subject: Avoid MapCacheLRU error when MessageCache fails to load
X-Git-Tag: 1.34.0-rc.0~4454^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=65ad02955c1766e594483cb7374447b7820cd9d0;p=lhc%2Fweb%2Fwiklou.git

Avoid MapCacheLRU error when MessageCache fails to load

Bug: T201893
Change-Id: I6093113a3ffa8092dea3351a6ed6c815c7ff7162
---

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 5c14818a52..afd24f44a3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -368,7 +368,7 @@ class MessageCache {
 		if ( !$success ) {
 			$where[] = 'loading FAILED - cache is disabled';
 			$this->mDisable = true;
-			$this->cache->set( $code, null );
+			$this->cache->set( $code, [] );
 			wfDebugLog( 'MessageCacheError', __METHOD__ . ": Failed to load $code\n" );
 			# This used to throw an exception, but that led to nasty side effects like
 			# the whole wiki being instantly down if the memcached server died