From bcb31523a8c9e6bc81024cb947f4a91d96dd1862 Mon Sep 17 00:00:00 2001 From: John Du Hart Date: Thu, 1 Sep 2011 04:26:21 +0000 Subject: [PATCH] Follow-up r95930, consolidate into one message per CR --- includes/EditPage.php | 4 +--- languages/messages/MessagesEn.php | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index a0bafa7c34..7ef26628a0 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1606,14 +1606,12 @@ HTML } $curUP = $wgUser->getUserPage(); - $sk = $wgOut->getSkin(); if ( $this->mTitle->getNamespace() == NS_USER && substr( $this->mTitle->getPrefixedText(), 0, strlen( $curUP->getPrefixedText() ) ) != $curUP->getPrefixedText() && $this->formtype != 'preview' && $this->formtype != 'diff' ) { - $utpLink = $sk->makeKnownLinkObj( $this->mTitle->getTalkPage(), wfMsgHtml( 'editinguserpagetalklink' ), 'action=edit' ); - $wgOut->addHTML( wfMsgWikiHtml( 'editinguserpage', $utpLink ) ); + $wgOut->addHTML( wfMessage( 'editinguserpage', $this->mTitle->getTalkPage()->getFullURL( 'action=edit' ) )->parse() ); } if ( wfReadOnly() ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index cafa477adf..3f1f1c9dd3 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1437,8 +1437,7 @@ It appears to have been deleted.', 'edit-no-change' => 'Your edit was ignored, because no change was made to the text.', 'edit-already-exists' => 'Could not create a new page. It already exists.', -'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, $1.", -'editinguserpagetalklink' => 'edit their talk page', +'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, [$1 edit their talk page].", 'addsection-preload' => '', # do not translate or duplicate this message to other languages 'addsection-editintro' => '', # do not translate or duplicate this message to other languages -- 2.20.1