From bb462e51935b5bd646019b765e584c3a2045a6af Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 19 Nov 2017 21:30:45 -0800 Subject: [PATCH] Fix some broke cache key generations Change-Id: Ib724fe0cfa866351caee89d3451b6c4b7b6a4578 --- includes/changes/ChangesList.php | 4 +++- includes/media/TransformationalImageHandler.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php index bc50096f1b..5b8559e68a 100644 --- a/includes/changes/ChangesList.php +++ b/includes/changes/ChangesList.php @@ -576,7 +576,9 @@ class ChangesList extends ContextSource { return ''; } $cache = $this->watchMsgCache; - return $cache->getWithSetCallback( $count, $cache::TTL_INDEFINITE, + return $cache->getWithSetCallback( + $cache->makeKey( 'watching-users-msg', $count ), + $cache::TTL_INDEFINITE, function () use ( $count ) { return $this->msg( 'number_of_watching_users_RCview' ) ->numParams( $count )->escaped(); diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index de438da2cf..85430d2c23 100644 --- a/includes/media/TransformationalImageHandler.php +++ b/includes/media/TransformationalImageHandler.php @@ -512,7 +512,7 @@ abstract class TransformationalImageHandler extends ImageHandler { $cache = MediaWikiServices::getInstance()->getLocalServerObjectCache(); $method = __METHOD__; return $cache->getWithSetCallback( - 'imagemagick-version', + $cache->makeGlobalKey( 'imagemagick-version' ), $cache::TTL_HOUR, function () use ( $method ) { global $wgImageMagickConvertCommand; -- 2.20.1