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

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

Browse source 
Without a default the preference is treat as unknown and possible values
identical to the default are not excluded from javascript code or
database.

Bug: T291748
Change-Id: I37cf1cd87a5ef1fd91aba0c3cc4b0e3f9c9c08b4
This commit is contained in:
Umherirrender 2021-09-29 02:46:36 +02:00 committed by Krinkle
parent 0d675c382b
commit 1b334a48e9
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/user/DefaultOptionsLookup.php
View file

@ -82,14 +82,12 @@ class DefaultOptionsLookup extends UserOptionsLookup {
$this->defaultOptions = $this->serviceOptions->get( 'DefaultUserOptions' );
// 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 ) {
if ( $langCode === $this->contentLang->getCode() ) {
$this->defaultOptions['variant'] = $langCode;
} else {
$this->defaultOptions["variant-$langCode"] = $langCode;
}
}
// NOTE: don't use SearchEngineConfig::getSearchableNamespaces here,
// since extensions may change the set of searchable namespaces depending

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

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