Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to remove a hard-coded "wikipedia".

Browse source 
Change-Id: I3c1567929eaa11a6ca0f3e8d7fe73653375b595b
This commit is contained in:
Liangent 2013-06-01 15:52:26 +00:00 committed by Reedy
parent f089e20bc0
commit bc2915b722
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/SiteConfiguration.php
View file

@ -477,13 +477,13 @@ class SiteConfiguration {
$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;
}

2
tests/phpunit/includes/SiteConfigurationTest.php
View file

@ -31,7 +31,7 @@ class SiteConfigurationTest extends MediaWikiTestCase {
$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(