bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid loading ext.uls.compactlinks module for Vector 2022 skin

Browse Source 
Bug: T353850
Change-Id: I43551be73da2126fd84ffaa0d37faec58bc47135
This commit is contained in:
NikG
2024-01-04 20:47:06 +02:00
committed by jenkins-bot
parent 1e4466ec16
commit 0b7ae1dce6
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/Hooks.php
View File

@@ -97,6 +97,18 @@ class Hooks implements
return (bool)$this->config->get( 'ULSEnable' );
}
/**
* Checks whether language is in header.
*
* @param Skin $skin
* @return bool
*/
private function isLanguageInHeader( Skin $skin ): bool {
$languageInHeaderConfig = $skin->getConfig()->get( 'VectorLanguageInHeader' );
$userStatus = $skin->getUser()->isAnon() ? 'logged_out' : 'logged_in';
return $languageInHeaderConfig[ $userStatus ] ?? true;
}
/**
* Whether ULS Compact interlanguage links enabled
*
@@ -110,7 +122,7 @@ class Hooks implements
return false;
}
if ( $skin->getSkinName() === 'vector-2022' ) {
return true;
return !$this->isLanguageInHeader( $skin );
}
if ( $this->config->get( 'ULSCompactLanguageLinksBetaFeature' ) === true &&
$this->config->get( 'InterwikiMagic' ) === true &&
@@ -165,9 +177,11 @@ class Hooks implements
$excludedLinks = $out->getProperty( 'noexternallanglinks' );
$override = is_array( $excludedLinks ) && in_array( '*', $excludedLinks, true );
$isCompactLinksEnabled = $this->isCompactLinksEnabled( $out->getUser(), $skin );
$isVector2022LanguageInHeader = $skin->getSkinName() === 'vector-2022' && $this->isLanguageInHeader( $skin );
$config = [
'wgULSPosition' => $this->config->get( 'ULSPosition' ),
'wgULSisCompactLinksEnabled' => $isCompactLinksEnabled,
'wgVector2022LanguageInHeader' => $isVector2022LanguageInHeader
];
// Load compact links if no mw-interlanguage-selector element is present in the page HTML.