Follow-up r95930, consolidate into one message per CR

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a0bafa7..7ef2662 100644 (file)
--- 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 cafa477..3f1f1c9 100644 (file)
--- 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