From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 16 Oct 2018 03:00:06 +0000 (-0700)
Subject: Use new WikiMap::getCurrentWikiDomain() for objectcache and profiler keyspace
X-Git-Tag: 1.34.0-rc.0~3614^2
X-Git-Url: https://git.cyclocoop.org/admin/Duna?a=commitdiff_plain;h=42a6f991e0a8b1f0516c1151cdd9f8a5eabc319a;p=lhc%2Fweb%2Fwiklou.git

Use new WikiMap::getCurrentWikiDomain() for objectcache and profiler keyspace

Change-Id: I0e77c58a55b7ce908ec1d6399ec6629d00a48953
---

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;
 		}