X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FVector%2FVectorTemplate.php;h=291b761c439cb1c09484458cb38629733674b45a;hb=b59fe387766b1aaf117f04abd7e3a070f2e11b11;hp=7dc376ae77ad0c63a3100f56cccdb0177310bc59;hpb=e94cf7a345e7cfa489d32d6dadabfbe5c78899b9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/Vector/VectorTemplate.php b/skins/Vector/VectorTemplate.php
index 7dc376ae77..291b761c43 100644
--- a/skins/Vector/VectorTemplate.php
+++ b/skins/Vector/VectorTemplate.php
@@ -97,7 +97,6 @@ class VectorTemplate extends BaseTemplate {
 		<div id="content" class="mw-body" role="main">
 			<a id="top"></a>
 
-			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
 			<?php
 			if ( $this->data['sitenotice'] ) {
 				?>
@@ -411,25 +410,19 @@ class VectorTemplate extends BaseTemplate {
 						echo ' emptyPortlet';
 					}
 					?>" aria-labelledby="p-variants-label">
-						<h3 id="mw-vector-current-variant">
-							<?php
-							foreach ( $this->data['variant_urls'] as $link ) {
-								?>
-								<?php
-								if ( stripos( $link['attributes'], 'selected' ) !== false ) {
-									?>
-									<?php
-									echo htmlspecialchars( $link['text'] )
-									?>
-								<?php
-								}
-								?>
-							<?php
+						<?php
+						// Replace the label with the name of currently chosen variant, if any
+						$variantLabel = $this->getMsg( 'variants' )->text();
+						foreach ( $this->data['variant_urls'] as $link ) {
+							if ( stripos( $link['attributes'], 'selected' ) !== false ) {
+								$variantLabel = $link['text'];
+								break;
 							}
-							?>
-						</h3>
-
-						<h3 id="p-variants-label"><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h3>
+						}
+						?>
+						<h3 id="p-variants-label"><span
+							style="display: block;" <?php /* Temporary WMF deployment hack, to be removed before 1.24 release */ ?>
+							><?php echo htmlspecialchars( $variantLabel ) ?></span><a href="#"></a></h3>
 
 						<div class="menu">
 							<ul>
@@ -499,7 +492,9 @@ class VectorTemplate extends BaseTemplate {
 						echo ' emptyPortlet';
 					}
 					?>" aria-labelledby="p-cactions-label">
-						<h3 id="p-cactions-label"><span><?php $this->msg( 'vector-more-actions' ) ?></span><a href="#"></a></h3>
+						<h3 id="p-cactions-label"><span><?php
+							$this->msg( 'vector-more-actions' )
+						?></span><a href="#"></a></h3>
 
 						<div class="menu">
 							<ul<?php $this->html( 'userlangattributes' ) ?>>
@@ -551,7 +546,7 @@ class VectorTemplate extends BaseTemplate {
 
 						<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
 							<?php
-							if ($wgVectorUseSimpleSearch) {
+							if ( $wgVectorUseSimpleSearch ) {
 							?>
 							<div id="simpleSearch">
 								<?php