From c947f3288d9c29d54ed382bff2f4bfb3b6f617ea Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 13 Oct 2018 00:14:38 -0700 Subject: [PATCH] jobqueue: clean up JobQueueDB::getCacheKey() to use makeGlobalKey() Change-Id: I341720fda0d242c7822f78048cb49f63538d08bc --- includes/jobqueue/JobQueueDB.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php index 0b85fbe8be..0ae106db8e 100644 --- a/includes/jobqueue/JobQueueDB.php +++ b/includes/jobqueue/JobQueueDB.php @@ -787,10 +787,10 @@ class JobQueueDB extends JobQueue { * @return string */ private function getCacheKey( $property ) { - list( $db, $prefix ) = wfSplitWikiID( $this->wiki ); $cluster = is_string( $this->cluster ) ? $this->cluster : 'main'; - return wfForeignMemcKey( $db, $prefix, 'jobqueue', $cluster, $this->type, $property ); + return $this->cache->makeGlobalKey( + 'jobqueue', $this->wiki, $cluster, $this->type, $property ); } /** -- 2.20.1