| Index: trunk/phase3/includes/SpecialMovepage.php |
| — | — | @@ -274,22 +274,25 @@ |
| 275 | 275 | $old = Title::newFromText( $wgRequest->getText( 'oldtitle' ) ); |
| 276 | 276 | $new = Title::newFromText( $wgRequest->getText( 'newtitle' ) ); |
| 277 | 277 | $talkmoved = $wgRequest->getVal( 'talkmoved' ); |
| 278 | | - |
| 279 | | - $olink = $wgUser->getSkin()->makeKnownLinkObj( $old, '', 'redirect=no' ); |
| 280 | | - $nlink = $wgUser->getSkin()->makeKnownLinkObj( $new ); |
| | 278 | + $oldUrl = $old->getFullUrl( 'redirect=no' ); |
| | 279 | + $newUrl = $new->getFullURl(); |
| | 280 | + $oldText = $old->getPrefixedText(); |
| | 281 | + $newText = $new->getPrefixedText(); |
| | 282 | + $oldLink = "<span class='plainlinks'>[$oldUrl $oldText]</span>"; |
| | 283 | + $newLink = "<span class='plainlinks'>[$newUrl $newText]</span>"; |
| 281 | 284 | |
| 282 | | - $wgOut->addHtml( wfMsgExt( 'movepage-moved', array( 'parseinline', 'replaceafter' ), |
| 283 | | - $olink, $nlink, $old->getPrefixedText(), $new->getPrefixedText() ) ); |
| | 285 | + $s = wfMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText ); |
| 284 | 286 | |
| 285 | 287 | if ( $talkmoved == 1 ) { |
| 286 | | - $wgOut->addWikiText( wfMsg( 'talkpagemoved' ) ); |
| | 288 | + $s .= "\n\n" . wfMsg( 'talkpagemoved' ); |
| 287 | 289 | } elseif( 'articleexists' == $talkmoved ) { |
| 288 | | - $wgOut->addWikiText( wfMsg( 'talkexists' ) ); |
| | 290 | + $s .= "\n\n" . wfMsg( 'talkexists' ); |
| 289 | 291 | } else { |
| 290 | 292 | if( !$old->isTalkPage() && $talkmoved != 'notalkpage' ) { |
| 291 | | - $wgOut->addWikiText( wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ) ); |
| | 293 | + $s .= "\n\n" . wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ); |
| 292 | 294 | } |
| 293 | 295 | } |
| | 296 | + $wgOut->addWikiText( $s ); |
| 294 | 297 | } |
| 295 | 298 | |
| 296 | 299 | function showLogFragment( $title, &$out ) { |