Merge "Put new compact language links Beta Feature behind a feature flag"

UniversalLanguageSelector.hooks.php

@@ -63,7 +63,9 @@ class UniversalLanguageSelectorHooks {
 		$out->addModules( 'ext.uls.init' );
 
 		// If compact ULS beta feature is enabled
-		if ( class_exists( 'BetaFeatures' ) &&
+		if ( $wgULSCompactLinks &&
+			$wgULSPosition === 'interlanguage' &&
+			class_exists( 'BetaFeatures' ) &&
 			BetaFeatures::isFeatureEnabled( $out->getUser(), 'uls-compact-links' )
 		) {
 			$out->addModules( 'ext.uls.compactlinks' );

UniversalLanguageSelector.php

@@ -172,6 +172,16 @@ $GLOBALS['wgULSNoWebfontsSelectors'] = array( '#p-lang li.interlanguage-link > a
  */
 $GLOBALS['wgULSFontRepositoryBasePath'] = false;
 
+/**
+ * Whether the "Compact language links" Beta Feature is exposed. Requires
+ * $wgULSPosition to be 'interlanguage'.
+ *
+ * Defaults to false.
+ *
+ * @since 2014.03
+ */
+$GLOBALS['wgULSCompactLinks'] = false;
+
 // Internationalization
 $GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] =
 	__DIR__ . '/UniversalLanguageSelector.i18n.php';