* (bug 4334) Add "watch" links to Special:Unwatchedpages
* Generate target user page links in Special:Ipblocklist where appropriate (i.e. not an autoblock)
* Generate link to talk page of the blocker in Special:Ipblocklist, move contribs. link of the target next to their name
+* (bug 2757) 'Page move completed' screen should contain link to original page with &redirect=no
Misc.:
* PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
}
function showSuccess() {
- global $wgOut, $wgRequest, $wgRawHtml;
-
+ global $wgOut, $wgRequest, $wgUser;
+ $skin = $wgUser->getSkin();
+
$wgOut->setPagetitle( wfMsg( 'movepage' ) );
$wgOut->setSubtitle( wfMsg( 'pagemovedsub' ) );
- $oldtitle = $wgRequest->getVal('oldtitle');
- $newtitle = $wgRequest->getVal('newtitle');
+
+ $oldText = $wgRequest->getVal('oldtitle');
+ $newText = $wgRequest->getVal('newtitle');
+
+ $oldLink = $skin->makeKnownLinkObj( Title::newFromText( $oldText ), $oldText, 'redirect=no' );
+ $newLink = $skin->makeKnownLinkObj( Title::newFromText( $newText ), $newText );
+
$talkmoved = $wgRequest->getVal('talkmoved');
- $text = wfMsg( 'pagemovedtext', $oldtitle, $newtitle );
-
- # Temporarily disable raw html wikitext option out of XSS paranoia
- $marchingantofdoom = $wgRawHtml;
- $wgRawHtml = false;
- $wgOut->addWikiText( $text );
- $wgRawHtml = $marchingantofdoom;
+ $text = wfMsgHtml( 'pagemovedtext', $oldLink, $newLink );
+ $wgOut->addHTML( '<p>' . $text . '</p>' );
if ( $talkmoved == 1 ) {
$wgOut->addWikiText( wfMsg( 'talkpagemoved' ) );
} elseif( 'articleexists' == $talkmoved ) {
$wgOut->addWikiText( wfMsg( 'talkexists' ) );
} else {
- $ot = Title::newFromURL( $oldtitle );
- if ( ! $ot->isTalkPage() ) {
+ $oldTitle = Title::newFromText( $oldText );
+ if ( !$oldTitle->isTalkPage() ) {
$wgOut->addWikiText( wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ) );
}
}
'newtitle' => 'To new title',
'movepagebtn' => 'Move page',
'pagemovedsub' => 'Move succeeded',
-'pagemovedtext' => "Page \"[[$1]]\" moved to \"[[$2]]\".",
+'pagemovedtext' => "Page \"$1\" moved to \"$2\".",
'articleexists' => 'A page of that name already exists, or the
name you have chosen is not valid.
Please choose another name.',
"newtitle" => "Na nuwe titel",
"movepagebtn" => "Skuif bladsy",
"pagemovedsub" => "Verskuiwing het geslaag",
-"pagemovedtext" => "Bladsy \"[[$1]]\" geskuif na \"[[$2]]\".",
+"pagemovedtext" => "Bladsy \"$1\" geskuif na \"$2\".",
"articleexists" => "'n Bladsy met daardie naam bestaan reeds, of die naam wat jy gekies het, is nie geldig nie.
Kies asseblief 'n ander naam.",
"talkexists" => "Die bladsy self is suksesvol verskuif, maar die bespreekbladsy kon nie geskuif word nie omdat een reeds bestaan met die nuwe titel. Smelt hulle asseblief met die hand saam.",
'orphans' => 'الصفحات اليتيمة',
'otherlanguages' => ' لغات أخرى',
'pagemovedsub' => 'تم النقل بنجاح',
-'pagemovedtext' => 'تم نقل الصفحة "[[$1]]" إلى "[[$2]]".',
+'pagemovedtext' => 'تم نقل الصفحة "$1" إلى "$2".',
'passwordremindertitle' => 'تذكير بكلمة السر من ويكيبيديا',
'passwordsent' => 'تم إرسال كلمة سر جديدة إلى العنوان البريدي المسجل للمستخدم "$1".
يرجى محاولة تسجيل الدخول مرة أخرى عند إستلامها.',
'orphans' => 'Старонкі-сіраціны',
'otherlanguages' => 'На іншых мовах',
'others' => 'іншыя',
-'pagemovedtext' => 'Старонка «[[$1]]» перанесеная ў «[[$2]]».',
+'pagemovedtext' => 'Старонка «$1» перанесеная ў «$2».',
'pagetitle' => '$1 - {{SITENAME}}',
'popularpages' => 'Папулярныя старонкі',
'portal' => 'Суполка',
'newtitle' => 'Към ново заглавие',
'movepagebtn' => 'Преместване',
'pagemovedsub' => 'Преместването беше успешно',
-'pagemovedtext' => 'Страницата „[[$1]]“ беше преместена под името „[[$2]]“.',
+'pagemovedtext' => 'Страницата „$1“ беше преместена под името „$2“.',
'articleexists' => 'Вече съществува страница с това име или името, което сте избрали, е невалидно. Моля, изберете друго име.',
'talkexists' => "'''Страницата беше успешно преместена, но без съответната дискусионна страница, защото под новото име има една съществуваща. Моля, обединете ги ръчно.'''",
'movedto' => 'преместена като',
'newtitle' => "anv nevez",
'movepagebtn' => "Adenvel ar pennad",
'pagemovedsub' => "Dilec\'hiadenn kaset da benn vat",
-'pagemovedtext' => "Adkaset eo bet ar pennad \"[[$1]]\" da \"[[$2]]\".",
+'pagemovedtext' => "Adkaset eo bet ar pennad \"$1\" da \"$2\".",
'articleexists' => "Ur pennad gantañ an anv-se zo dija pe n\'eo ket reizh an titl hoc\'h eus dibabet.
Dibabit unan all mar plij.",
'talkexists' => "Dilec\'hiet mat eo bet ar bajenn hec\'h-unan met chomet eo ar bajenn gaozeal rak unan all a oa dija gant an anv nevez-se. Kendeuzit anezho c\'hwi hoc\'h-unan mar plij.",
"newtitle" => "A títol nou",
"movepagebtn" => "Reanomena pàgina",
"pagemovedsub" => "Reanomenament amb èxit",
-"pagemovedtext" => "Pàgina \"[[$1]]\" reanomenada a \"[[$2]]\".",
+"pagemovedtext" => "Pàgina \"$1\" reanomenada a \"$2\".",
"articleexists" => "Ja existeix una pàgina amb aquest nom, o el nom que heu
escollit no és vàlid.
Escolliu un altre nom, si us plau.",
'newtitle' => 'Na nový název',
'movepagebtn' => 'Přesunout stránku',
'pagemovedsub' => 'Úspěšně přesunuto',
-'pagemovedtext' => "Stránka „[[$1]]“ přesunuta na „[[$2]]“.
+'pagemovedtext' => "Stránka „$1“ přesunuta na „$2“.
'''Nyní''' následujte odkaz [[Speciální:Whatlinkshere/$1]]: pokud se v seznamu vyskytnou nějaké přesměrovače, je třeba je upravit tak, aby ukazovaly na nový název ($2), jinak nebudou fungovat.",
'articleexists' => 'Takto nazvaná stránka již existuje, nebo Vámi zvolený název je neplatný. Zvolte jiný název.',
'orphans' => 'Niechóné starnë',
'othercontribs' => 'Òpiarté na prôcë $1.',
'pagemovedsub' => 'Przeniesenié darzëło sã',
-'pagemovedtext' => 'Starna "[[$1]]" òsta przeniesłô do "[[$2]]".',
+'pagemovedtext' => 'Starna "$1" òsta przeniesłô do "$2".',
'pagetitle' => '$1 - {{SITENAME}}',
'passwordremindertext' => 'Chtos (prôwdëjuwerno Të, z adresë $1) pòprosëł ò wësłanié nowi parolë dopùscënkù do {{SITENAME}}. Aktualnô parola dlô brëkòwnika "$2" je "$3". Nôlepi mdze czej wlogùjesz sã terô ë zarô zmienisz parolã.',
'personaltools' => 'Priwatné przërëchtënczi',
"newtitle" => "i teitl newydd",
"movepagebtn" => "Symud tudalen",
"pagemovedsub" => "Symud yn llwyddiannus",
-"pagemovedtext" => "Mae tudalen \"[[$1]]\" wedi symud i \"[[$2]]\".",
+"pagemovedtext" => "Mae tudalen \"$1\" wedi symud i \"$2\".",
"articleexists" => "Mae tudalen gyda'r enw newydd yn bodoli'n barod, neu mae eich enw newydd ddim yn dilys.
Dewiswch enw newydd os gwelwch yn dda.",
"talkexists" => "Mae'r tudalen wedi symud yn llwyddiannus, ond roedd hi'n amhosibl symud y tudalen sgwrs am achos roedd ne un efo'r teitl newydd yn bodoli'n barod. Cysylltwch nhw eich hun, os gwelwch yn dda.",
"newtitle" => "Til ny titel",
"movepagebtn" => "Flyt side",
"pagemovedsub" => "Flytning gennemført",
-"pagemovedtext" => "Siden \"[[$1]]\" er flyttet til \"[[$2]]\".",
+"pagemovedtext" => "Siden \"$1\" er flyttet til \"$2\".",
"articleexists" => "En side med det navn eksisterer allerede, eller det
navn du har valgt er ikke gyldigt. Vælg et andet navn.",
"talkexists" => "Siden blev flyttet korrekt, men den tilhørende
"newtitle" => "Zu neuem Titel",
"movepagebtn" => "Artikel verschieben",
"pagemovedsub" => "Verschiebung erfolgreich",
-"pagemovedtext" => "Artikel \"[[$1]]\" wurde nach \"[[$2]]\" verschoben.",
+"pagemovedtext" => "Artikel \"$1\" wurde nach \"$2\" verschoben.",
"articleexists" => "Unter diesem Namen existiert bereits ein Artikel.
Bitte wählen Sie einen anderen Namen.",
"talkexists" => "Die Seite selbst wurde erfolgreich verschoben, aber die
'newtitle' => 'Na novi naslov',
"movepagebtn" => "Premjesti stranicu",
"pagemovedsub" => "Premještanje uspjelo",
-'pagemovedtext' => 'Stranica "[[$1]]" premještena je na "[[$2]]".',
+'pagemovedtext' => 'Stranica "$1" premještena je na "$2".',
'articleexists' => 'Stranica pod tim imenom već postoji ili ime koje ste odabrali nije u skladu s pravilima.
Molimo odaberite drugo ime.',
'talkexists' => '\'\'\'Sama stranica je uspješno prenesena, ali stranicu za razgovor nije bilo moguće prenijeti jer na odredištu već postoji stranica za razgovor. Molimo da ih ručno spojite.\'\'\'',