From ce94becb68ff07ca685665fa4688e94398fc30e0 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Tue, 18 Oct 2011 17:57:32 +0000 Subject: [PATCH] * (bug 18823) "move succeeded" text displays bluelinks even when redirect was suppressed Ping r100017 for the subpage part. --- RELEASE-NOTES-1.19 | 2 ++ includes/specials/SpecialMovepage.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 50753dce43..f928db9386 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -110,6 +110,8 @@ production. * Timezones are now recognised in user preferences when offset is different due to DST * (bug 31692) "summary" parameter now also work when undoing revisions +* (bug 18823) "move succeeded" text displays bluelinks even when redirect was + suppressed === API changes in 1.19 === * (bug 19838) siprop=interwikimap can now use the interwiki cache. diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index d6ac2c872d..f636608caa 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -424,15 +424,18 @@ class MovePageForm extends UnlistedSpecialPage { $out = $this->getOutput(); $out->setPagetitle( wfMsg( 'pagemovedsub' ) ); - $oldUrl = $ot->getFullUrl( 'redirect=no' ); - $newUrl = $nt->getFullUrl(); + $oldLink = Linker::link( + $ot, + null, + array(), + array( 'redirect' => 'no' ) + ); + $newLink = Linker::linkKnown( $nt ); $oldText = $ot->getPrefixedText(); $newText = $nt->getPrefixedText(); - $oldLink = "[$oldUrl $oldText]"; - $newLink = "[$newUrl $newText]"; $msgName = $createRedirect ? 'movepage-moved-redirect' : 'movepage-moved-noredirect'; - $out->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText ); + $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( $oldLink, $newLink, $oldText, $newText ) ); $out->addWikiMsg( $msgName ); # Now we move extra pages we've been asked to move: subpages and talk -- 2.20.1