From b1d7167444960b920ae34baa675319f67819d8f3 Mon Sep 17 00:00:00 2001
From: Robin Pepermans <robin@users.mediawiki.org>
Date: Mon, 12 Dec 2011 00:03:15 +0000
Subject: [PATCH] Remove the (useless) configuration option
 $wgVectorShowVariantName. If set to false (which is default), it is not clear
 to users what the dropdown menu is about. Secondly, other skins display all
 variants as different tabs. Thirdly, Serbian and Chinese projects (most
 active projects relevant to this) have set it to true.

---
 RELEASE-NOTES-1.19           |  1 +
 includes/DefaultSettings.php |  5 -----
 skins/Vector.php             | 18 ++++++++----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 86b61c372c..7d4e01e6ac 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -24,6 +24,7 @@ production.
   items to show by default on query pages (special pages such as Whatlinkshere).
 * (bug 32470) Increase the length of ug_group.
 * (bug 32239) Removed wgEnableTooltipsAndAccesskeys.
+* Removed $wgVectorShowVariantName.
 
 === New features in 1.19 ===
 * (bug 19838) Possibility to get all interwiki prefixes if the interwiki
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 58f1b327db..9be89cf8d9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2453,11 +2453,6 @@ $wgVectorUseSimpleSearch = false;
  */
 $wgVectorUseIconWatch = false;
 
-/**
- * Show the name of the current variant as a label in the variants drop-down menu
- */
-$wgVectorShowVariantName = false;
-
 /**
  * Display user edit counts in various prominent places.
  */
diff --git a/skins/Vector.php b/skins/Vector.php
index 688d6ac047..b3a890e836 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -326,7 +326,7 @@ class VectorTemplate extends BaseTemplate {
 	 * @param $elements array
 	 */
 	private function renderNavigation( $elements ) {
-		global $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
+		global $wgVectorUseSimpleSearch;
 
 		// If only one element was given, wrap it in an array, allowing more
 		// flexible arguments
@@ -355,15 +355,13 @@ class VectorTemplate extends BaseTemplate {
 				case 'VARIANTS':
 ?>
 <div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
-	<?php if ( $wgVectorShowVariantName ): ?>
-		<h4>
-		<?php foreach ( $this->data['variant_urls'] as $link ): ?>
-			<?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?>
-				<?php echo htmlspecialchars( $link['text'] ) ?>
-			<?php endif; ?>
-		<?php endforeach; ?>
-		</h4>
-	<?php endif; ?>
+	<h4>
+	<?php foreach ( $this->data['variant_urls'] as $link ): ?>
+		<?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?>
+			<?php echo htmlspecialchars( $link['text'] ) ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+	</h4>
 	<h5><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h5>
 	<div class="menu">
 		<ul<?php $this->html( 'userlangattributes' ) ?>>
-- 
2.20.1