| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1373,7 +1373,7 @@ |
| 1374 | 1374 | 'move-watch', |
| 1375 | 1375 | 'movepagebtn', |
| 1376 | 1376 | 'pagemovedsub', |
| 1377 | | - 'pagemovedtext', |
| | 1377 | + 'movepage-moved', |
| 1378 | 1378 | 'articleexists', |
| 1379 | 1379 | 'talkexists', |
| 1380 | 1380 | 'movedto', |
| Index: trunk/phase3/includes/SpecialMovepage.php |
| — | — | @@ -266,24 +266,26 @@ |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | function showSuccess() { |
| 270 | | - global $wgOut, $wgRequest, $wgRawHtml; |
| | 270 | + global $wgOut, $wgRequest, $wgUser, $wgRawHtml; |
| 271 | 271 | |
| 272 | 272 | $wgOut->setPagetitle( wfMsg( 'movepage' ) ); |
| 273 | 273 | $wgOut->setSubtitle( wfMsg( 'pagemovedsub' ) ); |
| 274 | 274 | |
| 275 | | - $oldText = wfEscapeWikiText( $wgRequest->getVal('oldtitle') ); |
| 276 | | - $newText = wfEscapeWikiText( $wgRequest->getVal('newtitle') ); |
| 277 | | - $talkmoved = $wgRequest->getVal('talkmoved'); |
| | 275 | + $old = Title::newFromText( $wgRequest->getText( 'oldtitle' ) ); |
| | 276 | + $new = Title::newFromText( $wgRequest->getText( 'newtitle' ) ); |
| | 277 | + $talkmoved = $wgRequest->getVal( 'talkmoved' ); |
| | 278 | + |
| | 279 | + $olink = $wgUser->getSkin()->makeKnownLinkObj( $old, '', 'redirect=no' ); |
| | 280 | + $nlink = $wgUser->getSkin()->makeKnownLinkObj( $new ); |
| 278 | 281 | |
| 279 | | - $wgOut->addHtml( wfMsgExt( 'pagemovedtext', array( 'parse' ), $oldText, $newText ) ); |
| | 282 | + $wgOut->addHtml( wfMsgExt( 'movepage-moved', array( 'parseinline', 'replaceafter' ), $olink, $nlink ) ); |
| 280 | 283 | |
| 281 | 284 | if ( $talkmoved == 1 ) { |
| 282 | 285 | $wgOut->addWikiText( wfMsg( 'talkpagemoved' ) ); |
| 283 | 286 | } elseif( 'articleexists' == $talkmoved ) { |
| 284 | 287 | $wgOut->addWikiText( wfMsg( 'talkexists' ) ); |
| 285 | 288 | } else { |
| 286 | | - $oldTitle = Title::newFromText( $oldText ); |
| 287 | | - if ( isset( $oldTitle ) && !$oldTitle->isTalkPage() && $talkmoved != 'notalkpage' ) { |
| | 289 | + if( !$old->isTalkPage() && $talkmoved != 'notalkpage' ) { |
| 288 | 290 | $wgOut->addWikiText( wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ) ); |
| 289 | 291 | } |
| 290 | 292 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2098,7 +2098,7 @@ |
| 2099 | 2099 | 'move-watch' => 'Watch this page', |
| 2100 | 2100 | 'movepagebtn' => 'Move page', |
| 2101 | 2101 | 'pagemovedsub' => 'Move succeeded', |
| 2102 | | -'pagemovedtext' => 'Page "[[$1]]" moved to "[[$2]]".', |
| | 2102 | +'movepage-moved' => "<big>'''\"$1\" has been moved to \"$2\"'''</big>", |
| 2103 | 2103 | 'articleexists' => 'A page of that name already exists, or the |
| 2104 | 2104 | name you have chosen is not valid. |
| 2105 | 2105 | Please choose another name.', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -231,8 +231,8 @@ |
| 232 | 232 | security settings are cranked this way and AJAX-y gets used. |
| 233 | 233 | * Delay AJAX watch initialization until click so IE 6 with ugly security |
| 234 | 234 | settings doesn't prompt you until you use the link. |
| | 235 | +* (bug 10399) Provide non-redirecting link to original title in Special:Movepage |
| 235 | 236 | |
| 236 | | - |
| 237 | 237 | == API changes since 1.10 == |
| 238 | 238 | |
| 239 | 239 | (For ongoing development discussion, see http://www.mediawiki.org/wiki/API) |