Page MenuHomePhabricator

T161453-REL1_28.patch

Authored By
Reedy
Mar 28 2017, 9:04 PM
Size
2 KB
Referenced Files
None
Subscribers
None

T161453-REL1_28.patch

From df3d39a7b713fb3f1b10ed13171f0c93867a5110 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Tue, 28 Mar 2017 21:47:08 +0100
Subject: [PATCH] Don't write LocalisationCache to temporary directory
Bug: T161453
Change-Id: I51b375c63fcece908da921c465c861968c9eee1c
---
RELEASE-NOTES-1.28 | 2 ++
includes/cache/localisation/LocalisationCache.php | 14 ++++++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 3ee3f05..1eabab2 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -11,6 +11,8 @@ This is not a release yet!
* (T154670) A missing method causing the MySQL installer to fatal in rare
circumstances was restored.
* (T154672) Un-deprecate ArticleAfterFetchContentObject hook.
+* (T161453) LocalisationCache will no longer use the temporary directory in it's
+ fallback chain when trying to work out where to write the cache.
== MediaWiki 1.28 ==
diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php
index 4970a2b..629eccc 100644
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -212,19 +212,17 @@ class LocalisationCache {
case 'detect':
if ( !empty( $conf['storeDirectory'] ) ) {
$storeClass = 'LCStoreCDB';
+ } elseif ( $wgCacheDirectory ) {
+ $storeConf['directory'] = $wgCacheDirectory;
+ $storeClass = 'LCStoreCDB';
} else {
- $cacheDir = $wgCacheDirectory ?: wfTempDir();
- if ( $cacheDir ) {
- $storeConf['directory'] = $cacheDir;
- $storeClass = 'LCStoreCDB';
- } else {
- $storeClass = 'LCStoreDB';
- }
+ $storeClass = 'LCStoreDB';
}
break;
default:
throw new MWException(
- 'Please set $wgLocalisationCacheConf[\'store\'] to something sensible.' );
+ 'Please set $wgLocalisationCacheConf[\'store\'] to something sensible.'
+ );
}
}
--
2.9.3

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4509524
Default Alt Text
T161453-REL1_28.patch (2 KB)

Event Timeline