Revision: 51819 Author: siebrand Date: 2009-06-13 12:24:43 +0000 (Sat, 13 Jun 2009)
Log Message: ----------- * follow-up to r51568: $id should not have been made an array * use linkKnown() instead of deprecated makeKnownLink() Modified Paths: -------------- trunk/phase3/includes/Skin.php Modified: trunk/phase3/includes/Skin.php =================================================================== --- trunk/phase3/includes/Skin.php 2009-06-13 08:57:33 UTC (rev 51818) +++ trunk/phase3/includes/Skin.php 2009-06-13 12:24:43 UTC (rev 51819) @@ -1426,7 +1426,8 @@ $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 @@ } 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 @@ // 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 @@ 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( _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs