From 22fabc32e58409542f2d13efc3b65796c4419389 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sat, 13 Jun 2009 12:24:43 +0000
Subject: [PATCH] * follow-up to r51568: $id should not have been made an array
 * use linkKnown() instead of deprecated makeKnownLink()

---
 includes/Skin.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 53a99e188c..866493f03d 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1426,7 +1426,8 @@ END;
 
 		$out = '';
 		if( $wgRightsPage ) {
-			$link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
+			$title = Title::newFromText( $wgRightsPage );
+			$link = $this->linkKnown( $title, $wgRightsText );
 		} elseif( $wgRightsUrl ) {
 			$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
 		} elseif( $wgRightsText ) {
@@ -1544,8 +1545,11 @@ END;
 	}
 
 	function copyrightLink() {
-		$s = $this->makeKnownLink( wfMsgForContent( 'copyrightpage' ),
-		  wfMsg( 'copyrightpagename' ) );
+		$title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
+		$s = $this->linkKnown(
+			$title,
+			wfMsg( 'copyrightpagename' )
+		);
 		return $s;
 	}
 
@@ -1558,8 +1562,11 @@ END;
 			// Otherwise, we display the link for the user, described in their
 			// language (which may or may not be the same as the default language),
 			// but we make the link target be the one site-wide page.
-			return $this->makeKnownLink( wfMsgForContent( $page ),
-				wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) );
+			$title = Title::newFromText( $page );
+			return $this->linkKnown(
+				$title,
+				wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
+			);
 		}
 	}
 
@@ -1673,11 +1680,11 @@ END;
 			if ( $this->mTitle->userIsWatching() ) {
 				$text = wfMsg( 'unwatchthispage' );
 				$query = array( 'action' => 'unwatch' );
-				$id = array( 'mw-unwatch-link' => $this->mWatchLinkNum );
+				$id = 'mw-unwatch-link' . $this->mWatchLinkNum;
 			} else {
 				$text = wfMsg( 'watchthispage' );
 				$query = array( 'action' => 'watch' );
-				$id = array( 'mw-watch-link' => $this->mWatchLinkNum );
+				$id = 'mw-watch-link' . $this->mWatchLinkNum;
 			}
 
 			$s = $this->link(
-- 
2.20.1