Merge "Remove wgULSCompactLinks configuration variable"

UniversalLanguageSelector.hooks.php

@@ -50,7 +50,7 @@ class UniversalLanguageSelectorHooks {
 	 * 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 @@ class UniversalLanguageSelectorHooks {
 
 		// 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 @@ class UniversalLanguageSelectorHooks {
 	}
 
 	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";

extension.json

@@ -89,9 +89,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": {