From be7c1397f4f4e7932c986386d53817807bff9aa6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 31 Dec 2008 21:31:20 +0000
Subject: [PATCH] * (bug 16786) Restored "redundant" links recently removed
 from Classic sidebar Reverted r44780, r44788

---
 RELEASE-NOTES      | 2 ++
 includes/Skin.php  | 8 ++++++--
 skins/Standard.php | 9 +++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8c16777fbe..b1a48c29f2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -462,6 +462,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * Ensure that all HTML id's begin with a letter as required by XHTML standard
 * Image moving over an existing file no longer throws a database error
 * (bug 14117) Image redirects from the shared repo now show "redirected from"
+* (bug 16786) Restored "redundant" links recently removed from Classic sidebar
+
 
 === API changes in 1.14 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index e5b39e2677..636b96bf75 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1160,11 +1160,15 @@ END;
 		global $wgOut;
 		$sep = " |\n";
 
-		$s = $this->mainPageLink();
+		$s = $this->mainPageLink() . $sep
+		  . $this->specialLink( 'recentchanges' );
 
 		if ( $wgOut->isArticleRelated() ) {
-			$s .=  $sep . $this->editThisPage() . $sep . $this->historyLink();
+			$s .=  $sep . $this->editThisPage()
+			  . $sep . $this->historyLink();
 		}
+		# Many people don't like this dropdown box
+		#$s .= $sep . $this->specialPagesList();
 
 		$s .= $this->variantLinks();
 
diff --git a/skins/Standard.php b/skins/Standard.php
index 01819ba025..1f3cab9587 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -227,6 +227,10 @@ class SkinStandard extends Skin {
 			# "Post a comment" link
 			if( ( $wgTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
 				$s .= '<br />' . $this->makeKnownLinkObj( $wgTitle, wfMsg( 'postcomment' ), 'action=edit&section=new' );
+			
+			#if( $tns%2 && $action!='edit' && !$wpPreview) {
+				#$s.= '<br />'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit&section=new');
+			#}
 
 			/*
 			watching could cause problems in edit mode:
@@ -250,6 +254,11 @@ class SkinStandard extends Skin {
 			if ($articleExists && $action !='history') {
 				$s .= $sep . $this->historyLink();
 			}
+			$s.=$sep . $this->whatLinksHere();
+
+			if($wgOut->isArticleRelated()) {
+				$s .= $sep . $this->watchPageLinksLink();
+			}
 
 			if ( NS_USER == $wgTitle->getNamespace()
 				|| $wgTitle->getNamespace() == NS_USER_TALK ) {
-- 
2.20.1