From: Aryeh Gregor <ayg@aryeh.name>
Date: Mon, 26 Aug 2019 09:41:56 +0000 (+0300)
Subject: Correctly register storeDirectory in l10n cache
X-Git-Tag: 1.34.0-rc.0~581
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=b78b8804d076618e967c7b31ec15a1bd9e35d1d0;hp=2d911d1f8c2accd3978cc20017b8a2c8ad75183d;p=lhc%2Fweb%2Fwiklou.git

Correctly register storeDirectory in l10n cache

e4468a1d6b6 made LocalisationCache a service and refactored a bunch of
setup code. In doing so, when processing 'storeDirectory' from
$wgLocalisationCacheConf, it accidentally started treating empty
non-null values (such as the default "false") as storage paths instead
of meaning "fall back to $wgCacheDirectory". This would have broken all
config that used file store for LocalisationCache and did not specify
'storeDirectory'.

Bug: T231183
Change-Id: I9ff16be628996b202599e3bb2feed088af03775f
---

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 21a66cde88..9daf70ddd8 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -298,7 +298,7 @@ return [
 		// Figure out what class to use for the LCStore
 		$storeArg = [];
 		$storeArg['directory'] =
-			$conf['storeDirectory'] ?? $services->getMainConfig()->get( 'CacheDirectory' );
+			$conf['storeDirectory'] ?: $services->getMainConfig()->get( 'CacheDirectory' );
 
 		if ( !empty( $conf['storeClass'] ) ) {
 			$storeClass = $conf['storeClass'];