From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 skins/Nostalgia.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'skins/Nostalgia.php')

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index d4f3f06f..6c599b21 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -57,11 +57,11 @@ class SkinNostalgia extends Skin {
 	}
 
 	function topLinks() {
-		global $wgOut, $wgUser, $wgEnableUploads;
+		global $wgOut, $wgUser;
 		$sep = " |\n";
 
 		$s = $this->mainPageLink() . $sep
-		  . $this->specialLink( 'recentchanges' );
+		  . $this->specialLink( 'Recentchanges' );
 
 		if ( $wgOut->isArticle() ) {
 			$s .= $sep . '<strong>' . $this->editThisPage() . '</strong>' . $sep . $this->historyLink();
@@ -71,9 +71,8 @@ class SkinNostalgia extends Skin {
 		$s .= $this->variantLinks();
 		$s .= $this->extensionTabLinks();
 		if ( $wgUser->isAnon() ) {
-			$s .= $sep . $this->specialLink( 'userlogin' );
+			$s .= $sep . $this->specialLink( 'Userlogin' );
 		} else {
-			$name = $wgUser->getName();
 			/* show user page and user talk links */
 			$s .= $sep . $this->link( $wgUser->getUserPage(), wfMsgHtml( 'mypage' ) );
 			$s .= $sep . $this->link( $wgUser->getTalkPage(), wfMsgHtml( 'mytalk' ) );
@@ -81,19 +80,20 @@ class SkinNostalgia extends Skin {
 				$s .= ' *';
 			}
 			/* show watchlist link */
-			$s .= $sep . $this->specialLink( 'watchlist' );
+			$s .= $sep . $this->specialLink( 'Watchlist' );
 			/* show my contributions link */
 			$s .= $sep . $this->link(
 				SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
 				wfMsgHtml( 'mycontris' ) );
 			/* show my preferences link */
-			$s .= $sep . $this->specialLink( 'preferences' );
+			$s .= $sep . $this->specialLink( 'Preferences' );
 			/* show upload file link */
-			if ( $wgEnableUploads ) {
-				$s .= $sep . $this->specialLink( 'upload' );
+			if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+				$s .= $sep . $this->getUploadLink();
 			}
+
 			/* show log out link */
-			$s .= $sep . $this->specialLink( 'userlogout' );
+			$s .= $sep . $this->specialLink( 'Userlogout' );
 		}
 
 		$s .= $sep . $this->specialPagesList();
-- 
cgit v1.2.3-54-g00ecf