From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 28 Mar 2019 18:41:47 +0000 (-0700)
Subject: Map WikiMap treat a schema of "dbo" similar to "mediawiki" to account for mssql"
X-Git-Tag: 1.34.0-rc.0~2268^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=e205941a92eb1f46b1ea5997c01e402cdf91bca1;hp=2ea9eb3460a6abb27b9e69c9d72ce56ef08da6f5;p=lhc%2Fweb%2Fwiklou.git

Map WikiMap treat a schema of "dbo" similar to "mediawiki" to account for mssql"

Change-Id: I07ae057dffc2c7203cde2c24ebb27067338b5096
---

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 628fbc0257..dbad4b0741 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -255,7 +255,7 @@ class WikiMap {
 	public static function getWikiIdFromDbDomain( $domain ) {
 		$domain = DatabaseDomain::newFromId( $domain );
 
-		if ( !in_array( $domain->getSchema(), [ null, 'mediawiki' ], true ) ) {
+		if ( !in_array( $domain->getSchema(), [ null, 'mediawiki', 'dbo' ], true ) ) {
 			// Include the schema if it is set and is not the default placeholder.
 			// This means a site admin may have specifically taylored the schemas.
 			// Domain IDs might use the form <DB>-<project>-<language>, meaning that
@@ -298,7 +298,7 @@ class WikiMap {
 		$domain = DatabaseDomain::newFromId( $domain );
 		$curDomain = self::getCurrentWikiDbDomain();
 
-		if ( !in_array( $curDomain->getSchema(), [ null, 'mediawiki' ], true ) ) {
+		if ( !in_array( $curDomain->getSchema(), [ null, 'mediawiki', 'dbo' ], true ) ) {
 			// Include the schema if it is set and is not the default placeholder.
 			// This means a site admin may have specifically taylored the schemas.
 			// Domain IDs might use the form <DB>-<project>-<language>, meaning that