From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 skins/Vector/VectorTemplate.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'skins/Vector/VectorTemplate.php')

diff --git a/skins/Vector/VectorTemplate.php b/skins/Vector/VectorTemplate.php
index 6e4e2f1e..fa3de5e0 100644
--- a/skins/Vector/VectorTemplate.php
+++ b/skins/Vector/VectorTemplate.php
@@ -102,11 +102,16 @@ class VectorTemplate extends BaseTemplate {
 			<?php
 			}
 			?>
+			<?php
+			if ( is_callable( array( $this, 'getIndicators' ) ) ) {
+				echo $this->getIndicators();
+			}
+			?>
 			<h1 id="firstHeading" class="firstHeading" lang="<?php
 			$this->data['pageLanguage'] =
 				$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
 			$this->text( 'pageLanguage' );
-			?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1>
+			?>"><?php $this->html( 'title' ) ?></h1>
 			<?php $this->html( 'prebodyhtml' ) ?>
 			<div id="bodyContent" class="mw-body-content">
 				<?php
@@ -135,7 +140,7 @@ class VectorTemplate extends BaseTemplate {
 				?>
 				<div id="jump-to-nav" class="mw-jump">
 					<?php $this->msg( 'jumpto' ) ?>
-					<a href="#mw-navigation"><?php
+					<a href="#mw-head"><?php
 						$this->msg( 'jumptonavigation' )
 						?></a><?php
 					$this->msg( 'comma-separator' )
@@ -187,9 +192,7 @@ class VectorTemplate extends BaseTemplate {
 				</div>
 			</div>
 			<div id="mw-panel">
-				<div id="p-logo" role="banner"><a style="background-image: url(<?php
-					$this->text( 'logopath' )
-					?>);" href="<?php
+				<div id="p-logo" role="banner"><a class="mw-wiki-logo" href="<?php
 					echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] )
 					?>" <?php
 					echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
@@ -254,7 +257,7 @@ class VectorTemplate extends BaseTemplate {
 
 	</body>
 </html>
-	<?php
+<?php
 	}
 
 	/**
@@ -466,7 +469,10 @@ class VectorTemplate extends BaseTemplate {
 								?>><span><a href="<?php
 										echo htmlspecialchars( $link['href'] )
 										?>" <?php
-										echo $link['key']
+										echo $link['key'];
+										if ( isset ( $link['rel'] ) ) {
+											echo ' rel="' . htmlspecialchars( $link['rel'] ) . '"';
+										}
 										?>><?php
 											// $link['text'] can be undefined - bug 27764
 											if ( array_key_exists( 'text', $link ) ) {
-- 
cgit v1.2.2