jenkins-bot has submitted this change and it was merged.
Change subject: Remove wgULSCompactLinks configuration variable
......................................................................
Remove wgULSCompactLinks configuration variable
This was used to expose Compact language links as beta feature.
Now a days, we want it as beta feature unconditionally and this
configuration does not make sense. So removing.
Bug: T134145
Change-Id: I40d5c07064b5f407ec37837b0835e0698f3a5256
---
M UniversalLanguageSelector.hooks.php
M extension.json
2 files changed, 5 insertions(+), 9 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index a7eae42..6152011 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -50,7 +50,7 @@
* Hook: BeforePageDisplay
*/
public static function addModules( $out, $skin ) {
- global $wgULSCompactLinks, $wgULSPosition, $wgULSGeoService,
$wgULSEventLogging,
+ global $wgULSPosition, $wgULSGeoService, $wgULSEventLogging,
$wgInterwikiMagic, $wgHideInterlanguageLinks;
// Load the style for users without JS, to hide the useless
links
@@ -70,8 +70,7 @@
// If compact ULS beta feature is enabled and is actually
functional
// (see onGetBetaFeaturePreferences)
- if ( $wgULSCompactLinks &&
- $wgInterwikiMagic === true &&
+ if ( $wgInterwikiMagic === true &&
$wgHideInterlanguageLinks === false &&
class_exists( 'BetaFeatures' ) &&
BetaFeatures::isFeatureEnabled( $out->getUser(),
'uls-compact-links' )
@@ -328,11 +327,10 @@
}
public static function onGetBetaFeaturePreferences( $user, &$prefs ) {
- global $wgExtensionAssetsPath, $wgULSCompactLinks,
+ global $wgExtensionAssetsPath,
$wgHideInterlanguageLinks, $wgInterwikiMagic;
- if ( $wgULSCompactLinks &&
- $wgInterwikiMagic === true &&
+ if ( $wgInterwikiMagic === true &&
$wgHideInterlanguageLinks === false
) {
$imagesDir =
"$wgExtensionAssetsPath/UniversalLanguageSelector/resources/images";
diff --git a/extension.json b/extension.json
index b953977..7596576 100644
--- a/extension.json
+++ b/extension.json
@@ -88,9 +88,7 @@
"#p-lang li.interlanguage-link > a"
],
"@ULSFontRepositoryBasePath": "Base path of ULS font
repository. If not set, will be set to
'UniversalLanguageSelector/data/fontrepo/fonts/', relative to
$wgExtensionAssetsPath. @since 2013.10",
- "ULSFontRepositoryBasePath": false,
- "@ULSCompactLinks": "Whether the \"Compact language links\"
Beta Feature is exposed. Requires $wgULSPosition to be \"interlanguage\".
Defaults to false. @since 2014.03",
- "ULSCompactLinks": false
+ "ULSFontRepositoryBasePath": false
},
"callback": "UniversalLanguageSelectorHooks::setVersionConstant",
"ResourceModules": {
--
To view, visit https://gerrit.wikimedia.org/r/285900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40d5c07064b5f407ec37837b0835e0698f3a5256
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
