jenkins-bot has submitted this change and it was merged.
Change subject: Attempt to remove a hard-coded "wikipedia".
......................................................................
Attempt to remove a hard-coded "wikipedia".
Change-Id: I3c1567929eaa11a6ca0f3e8d7fe73653375b595b
---
M includes/SiteConfiguration.php
M tests/phpunit/includes/SiteConfigurationTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 8234428..fa871fe 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -477,13 +477,13 @@
$site = null;
$lang = null;
- foreach ( $this->suffixes as $suffix ) {
+ foreach ( $this->suffixes as $altSite => $suffix ) {
if ( $suffix === '' ) {
$site = '';
$lang = $db;
break;
} elseif ( substr( $db, -strlen( $suffix ) ) == $suffix
) {
- $site = $suffix == 'wiki' ? 'wikipedia' :
$suffix;
+ $site = is_numeric( $altSite ) ? $suffix :
$altSite;
$lang = substr( $db, 0, strlen( $db ) - strlen(
$suffix ) );
break;
}
diff --git a/tests/phpunit/includes/SiteConfigurationTest.php
b/tests/phpunit/includes/SiteConfigurationTest.php
index 4cdf020..181a913 100644
--- a/tests/phpunit/includes/SiteConfigurationTest.php
+++ b/tests/phpunit/includes/SiteConfigurationTest.php
@@ -31,7 +31,7 @@
$this->mConf = new SiteConfiguration;
- $this->mConf->suffixes = array( 'wiki' );
+ $this->mConf->suffixes = array( 'wikipedia' => 'wiki' );
$this->mConf->wikis = array( 'enwiki', 'dewiki', 'frwiki' );
$this->mConf->settings = array(
'simple' => array(
--
To view, visit https://gerrit.wikimedia.org/r/66338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c1567929eaa11a6ca0f3e8d7fe73653375b595b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
