From 42a6f991e0a8b1f0516c1151cdd9f8a5eabc319a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 15 Oct 2018 20:00:06 -0700 Subject: [PATCH] Use new WikiMap::getCurrentWikiDomain() for objectcache and profiler keyspace Change-Id: I0e77c58a55b7ce908ec1d6399ec6629d00a48953 --- includes/objectcache/ObjectCache.php | 2 +- includes/profiler/Profiler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 6d76d5ed12..cd3c64205d 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -154,7 +154,7 @@ class ObjectCache { return $keyspace; } - return wfWikiID(); + return WikiMap::getCurrentWikiDomain()->getId(); } /** diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php index bf4ddc7c91..5c38159483 100644 --- a/includes/profiler/Profiler.php +++ b/includes/profiler/Profiler.php @@ -115,7 +115,7 @@ abstract class Profiler { */ public function getProfileID() { if ( $this->profileID === false ) { - return wfWikiID(); + return WikiMap::getCurrentWikiDomain()->getId(); } else { return $this->profileID; } -- 2.20.1