* (bug 18823) "move succeeded" text displays bluelinks even when redirect was suppressed

Ping r100017 for the subpage part.

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 50753dc..f928db9 100644 (file)
--- 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 d6ac2c8..f636608 100644 (file)
--- 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 = "<span class='plainlinks'>[$oldUrl $oldText]</span>";
-               $newLink = "<span class='plainlinks'>[$newUrl $newText]</span>";
 
                $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