$infoMap = [];
// Make sure at least the current wiki is set, for simple configurations.
// This also makes it the first in the map, which is useful for common cases.
- $wikiId = self::getWikiIdFromDomain( self::getCurrentWikiDomain() );
+ $wikiId = self::getWikiIdFromDbDomain( self::getCurrentWikiDbDomain() );
$infoMap[$wikiId] = [
'url' => $wgCanonicalServer,
'parts' => wfParseUrl( $wgCanonicalServer )
* Get the wiki ID of a database domain
*
* This is like DatabaseDomain::getId() without encoding (for legacy reasons)
+ * and without the schema if it merely set to the generic value "mediawiki"
*
* @param string|DatabaseDomain $domain
* @return string
+ * @since 1.31
*/
- public static function getWikiIdFromDomain( $domain ) {
+ public static function getWikiIdFromDbDomain( $domain ) {
$domain = DatabaseDomain::newFromId( $domain );
+ 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
+ // the schema portion must be accounted for to disambiguate wikis.
+ return "{$domain->getDatabase()}-{$domain->getSchema()}-{$domain->getTablePrefix()}";
+ }
+
+ // Note that if this wiki ID is passed a a domain ID to LoadBalancer, then it can
+ // handle the schema by assuming the generic "mediawiki" schema if needed.
return strlen( $domain->getTablePrefix() )
? "{$domain->getDatabase()}-{$domain->getTablePrefix()}"
- : $domain->getDatabase();
+ : (string)$domain->getDatabase();
+ }
+
+ /**
+ * @param string $domain
+ * @return string
+ * @deprecated Since 1.33; use getWikiIdFromDbDomain()
+ */
+ public static function getWikiIdFromDomain( $domain ) {
+ return self::getWikiIdFromDbDomain( $domain );
}
/**
* @return DatabaseDomain Database domain of the current wiki
* @since 1.33
*/
- public static function getCurrentWikiDomain() {
+ public static function getCurrentWikiDbDomain() {
global $wgDBname, $wgDBmwschema, $wgDBprefix;
// Avoid invoking LBFactory to avoid any chance of recursion
return new DatabaseDomain( $wgDBname, $wgDBmwschema, (string)$wgDBprefix );
* @return bool Whether $domain has the same DB/prefix as the current wiki
* @since 1.33
*/
- public static function isCurrentWikiDomain( $domain ) {
+ public static function isCurrentWikiDbDomain( $domain ) {
$domain = DatabaseDomain::newFromId( $domain );
- $curDomain = self::getCurrentWikiDomain();
+ $curDomain = self::getCurrentWikiDbDomain();
+
+ 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
+ // the schema portion must be accounted for to disambiguate wikis.
+ return $curDomain->equals( $domain );
+ }
return (
$curDomain->getDatabase() === $domain->getDatabase() &&
- // @TODO: check schema instead of assuming it's ""/"mediawiki" and never collides
$curDomain->getTablePrefix() === $domain->getTablePrefix()
);
}
* @since 1.33
*/
public static function isCurrentWikiId( $wikiId ) {
- return ( self::getWikiIdFromDomain( self::getCurrentWikiDomain() ) === $wikiId );
+ return ( self::getWikiIdFromDbDomain( self::getCurrentWikiDbDomain() ) === $wikiId );
}
}