From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 15 Aug 2019 12:37:29 +0000 (-0400)
Subject: Remove Oracle reference from WikiMap
X-Git-Tag: 1.34.0-rc.0~441^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=a8cc16cbd7b6a008f8e74f0a24f1ebb6eefec55e;p=lhc%2Fweb%2Fwiklou.git

Remove Oracle reference from WikiMap

Bug: T230418
Change-Id: I06536034a9d7f176e65b087cc2d3ad65d172961b
---

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 03638778a6..dba60f2d41 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -256,7 +256,7 @@ class WikiMap {
 	 * Get the wiki ID of a database domain
 	 *
 	 * This is like DatabaseDomain::getId() without encoding (for legacy reasons) and
-	 * without the schema if it is the generic installer default of "mediawiki"/"dbo"
+	 * without the schema if it is the generic installer default of "mediawiki"
 	 *
 	 * @see $wgDBmwschema
 	 * @see PostgresInstaller
@@ -272,7 +272,7 @@ class WikiMap {
 		// the installer default then it is probably the case that the schema is the same for
 		// all wikis in the farm. Historically, any wiki farm had to make the database/prefix
 		// combination unique per wiki. Ommit the schema if it does not seem wiki specific.
-		if ( !in_array( $domain->getSchema(), [ null, 'mediawiki', 'dbo' ], true ) ) {
+		if ( !in_array( $domain->getSchema(), [ null, 'mediawiki' ], true ) ) {
 			// This means a site admin may have specifically taylored the schemas.
 			// Domain IDs might use the form <DB>-<project>- or <DB>-<project>-<language>_,
 			// meaning that the schema portion must be accounted for to disambiguate wikis.