dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update OOUI to v0.34.0"
[lhc/web/wiklou.git]
/
includes
/
WikiMap.php
diff --git
a/includes/WikiMap.php
b/includes/WikiMap.php
index
23b0e3e
..
dba60f2
100644
(file)
--- a/
includes/WikiMap.php
+++ b/
includes/WikiMap.php
@@
-256,11
+256,10
@@
class WikiMap {
* Get the wiki ID of a database domain
*
* This is like DatabaseDomain::getId() without encoding (for legacy reasons) and
* 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
*
* @see $wgDBmwschema
* @see PostgresInstaller
- * @see MssqlInstaller
*
* @param string|DatabaseDomain $domain
* @return string
*
* @param string|DatabaseDomain $domain
* @return string
@@
-273,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.
// 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.
// 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.
@@
-286,15
+285,6
@@
class WikiMap {
: (string)$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
/**
* @return DatabaseDomain Database domain of the current wiki
* @since 1.33
@@
-311,7
+301,7
@@
class WikiMap {
* @since 1.33
*/
public static function isCurrentWikiDbDomain( $domain ) {
* @since 1.33
*/
public static function isCurrentWikiDbDomain( $domain ) {
- return self::getCurrentWikiDbDomain()->equals(
DatabaseDomain::newFromId( $domain )
);
+ return self::getCurrentWikiDbDomain()->equals(
$domain
);
}
/**
}
/**