Correct the logic for the ULS settings cog for Vector 2022
Bug: T315036 Change-Id: I9fe711cee57ee07dabba5c04f3c7faa5eb82a2c4
This commit is contained in:
@@ -529,11 +529,21 @@ class Hooks implements
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @todo: document what this block is for.
|
// The ULS settings cog is only needed on projects which show the ULS button in the sidebar
|
||||||
if ( $skin->getSkinName() !== 'vector-2022' && $this->config->get( 'ULSPosition' ) !== 'interlanguage' ) {
|
// e.g. it is shown in the personal menu
|
||||||
|
if ( $this->config->get( 'ULSPosition' ) !== 'interlanguage' ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For Vector 2022, the ULS settings cog is not needed for projects
|
||||||
|
// where a dedicated language button in the header (VectorLanguageInHeader is true).
|
||||||
|
if ( $skin->getSkinName() === 'vector-2022' ) {
|
||||||
|
$languageInHeaderConfig = $skin->getConfig()->get( 'VectorLanguageInHeader' );
|
||||||
|
if ( $languageInHeaderConfig[ $skin->getUser()->isAnon() ? 'logged_out' : 'logged_in' ] ?? true ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( !$this->isEnabled() ) {
|
if ( !$this->isEnabled() ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user