From afc530c33e2f3ed886ce547ae4dc5df3ce510e46 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 21 Oct 2018 00:02:11 -0700
Subject: [PATCH] Use WikiMap methods in ClassicInterwikiLookup instead of
 wfWikiId()

Change-Id: Ia3d843c79fa31fec59a04b92f4619458ae06de62
---
 includes/interwiki/ClassicInterwikiLookup.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php
index cdf4cde618..f6265f787a 100644
--- a/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@ -27,6 +27,7 @@ use Cdb\Reader as CdbReader;
 use Hooks;
 use Interwiki;
 use Language;
+use WikiMap;
 use MapCacheLRU;
 use WANObjectCache;
 use Wikimedia\Rdbms\Database;
@@ -212,17 +213,20 @@ class ClassicInterwikiLookup implements InterwikiLookup {
 	 */
 	private function getInterwikiCacheEntry( $prefix ) {
 		wfDebug( __METHOD__ . "( $prefix )\n" );
+
+		$wikiId = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+
 		$value = false;
 		try {
 			// Resolve site name
 			if ( $this->interwikiScopes >= 3 && !$this->thisSite ) {
-				$this->thisSite = $this->getCacheValue( '__sites:' . wfWikiID() );
+				$this->thisSite = $this->getCacheValue( '__sites:' . $wikiId );
 				if ( $this->thisSite == '' ) {
 					$this->thisSite = $this->fallbackSite;
 				}
 			}
 
-			$value = $this->getCacheValue( wfWikiID() . ':' . $prefix );
+			$value = $this->getCacheValue( $wikiId . ':' . $prefix );
 			// Site level
 			if ( $value == '' && $this->interwikiScopes >= 3 ) {
 				$value = $this->getCacheValue( "_{$this->thisSite}:{$prefix}" );
@@ -334,11 +338,14 @@ class ClassicInterwikiLookup implements InterwikiLookup {
 	 */
 	private function getAllPrefixesCached( $local ) {
 		wfDebug( __METHOD__ . "()\n" );
+
+		$wikiId = WikiMap::getWikiIdFromDomain( WikiMap::getCurrentWikiDomain() );
+
 		$data = [];
 		try {
 			/* Resolve site name */
 			if ( $this->interwikiScopes >= 3 && !$this->thisSite ) {
-				$site = $this->getCacheValue( '__sites:' . wfWikiID() );
+				$site = $this->getCacheValue( '__sites:' . $wikiId );
 
 				if ( $site == '' ) {
 					$this->thisSite = $this->fallbackSite;
@@ -357,7 +364,7 @@ class ClassicInterwikiLookup implements InterwikiLookup {
 			if ( $this->interwikiScopes >= 3 ) {
 				$sources[] = '_' . $this->thisSite;
 			}
-			$sources[] = wfWikiID();
+			$sources[] = $wikiId;
 
 			foreach ( $sources as $source ) {
 				$list = $this->getCacheValue( '__list:' . $source );
-- 
2.20.1