From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sun, 8 Apr 2007 13:40:33 +0000 (+0000)
Subject: * Couple of more uses
X-Git-Tag: 1.31.0-rc.0~53448
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=c9be5f2d2d1aecb30019433572bb489e5f1bb6fe;p=lhc%2Fweb%2Fwiklou.git

* Couple of more uses
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 61288ec7be..96c71743d6 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -806,11 +806,8 @@ class Linker {
 	 * @private
 	 */
 	function userTalkLink( $userId, $userText ) {
-		global $wgLang;
-		$talkname = $wgLang->getNsText( NS_TALK ); # use the shorter name
-
 		$userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
-		$userTalkLink = $this->makeLinkObj( $userTalkPage, $talkname );
+		$userTalkLink = $this->makeLinkObj( $userTalkPage, wfMsgHtml( 'talkpagelinktext' ) );
 		return $userTalkLink;
 	}
 
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 2df568b612..3dbb1936a3 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -377,7 +377,7 @@ function wfSpecialContributions( $par = null ) {
  * @param $nt @see Title object for the target
  */
 function contributionsSub( $nt ) {
-	global $wgSysopUserBans, $wgLang, $wgUser;
+	global $wgSysopUserBans, $wgUser;
 
 	$sk = $wgUser->getSkin();
 	$id = User::idFromName( $nt->getText() );
@@ -390,7 +390,7 @@ function contributionsSub( $nt ) {
 	$talk = $nt->getTalkPage();
 	if( $talk ) {
 		# Talk page link
-		$tools[] = $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) );
+		$tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
 		if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
 			# Block link
 			if( $wgUser->isAllowed( 'block' ) )