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

Merge "user: Add default value for all "variant" user option keys"

Browse source
This commit is contained in:
jenkins-bot 2021-10-25 20:07:36 +00:00 committed by Gerrit Code Review
commit 226dbef3f6
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/user/DefaultOptionsLookup.php
View file

@ -82,13 +82,11 @@ class DefaultOptionsLookup extends UserOptionsLookup {
$this->defaultOptions = $this->serviceOptions->get( 'DefaultUserOptions' ); $this->defaultOptions = $this->serviceOptions->get( 'DefaultUserOptions' );
// Default language setting // Default language setting
$this->defaultOptions['language'] = $this->contentLang->getCode(); $contentLangCode = $this->contentLang->getCode();
$this->defaultOptions['language'] = $contentLangCode;
$this->defaultOptions['variant'] = $contentLangCode;
foreach ( LanguageConverter::$languagesWithVariants as $langCode ) { foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
if ( $langCode === $this->contentLang->getCode() ) { $this->defaultOptions["variant-$langCode"] = $langCode;
$this->defaultOptions['variant'] = $langCode;
} else {
$this->defaultOptions["variant-$langCode"] = $langCode;
}
} }
// NOTE: don't use SearchEngineConfig::getSearchableNamespaces here, // NOTE: don't use SearchEngineConfig::getSearchableNamespaces here,

2
tests/phpunit/includes/auth/AuthManagerTest.php
View file

@ -751,7 +751,7 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase {
return [ return [
[ 'zh', false, 'zh', 'zh' ], [ 'zh', false, 'zh', 'zh' ],
[ 'zh', true, 'de', 'zh' ], [ 'zh', true, 'de', 'zh' ],
[ 'fr', true, 'de', null ], [ 'fr', true, 'de', 'fr' ],
]; ];
} }