From c1519768682ff33b06edfa5f4108c5e379d725aa Mon Sep 17 00:00:00 2001 From: Rob Church Date: Mon, 16 Jan 2006 00:13:01 +0000 Subject: [PATCH] Bug 2757: 'Page move completed' screen should contain link to original page with &redirect=no --- RELEASE-NOTES | 1 + includes/SpecialMovepage.php | 27 ++++++++++++++------------- languages/Language.php | 2 +- languages/LanguageAf.php | 2 +- languages/LanguageAr.php | 2 +- languages/LanguageBe.php | 2 +- languages/LanguageBg.php | 2 +- languages/LanguageBr.php | 2 +- languages/LanguageCa.php | 2 +- languages/LanguageCs.php | 2 +- languages/LanguageCsb.php | 2 +- languages/LanguageCy.php | 2 +- languages/LanguageDa.php | 2 +- languages/LanguageDe.php | 2 +- languages/LanguageHr.php | 2 +- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 16b80bdc2f..1468d32a54 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -310,6 +310,7 @@ Special Pages: * (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 diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php index bfc2af9b79..c5f9dc053d 100644 --- a/includes/SpecialMovepage.php +++ b/includes/SpecialMovepage.php @@ -241,29 +241,30 @@ class MovePageForm { } 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( '

' . $text . '

' ); 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 ) ) ); } } diff --git a/languages/Language.php b/languages/Language.php index 8667917ca1..8afb59ebc2 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1574,7 +1574,7 @@ to move a page.", '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.', diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php index dfffb62ba2..908dea307d 100644 --- a/languages/LanguageAf.php +++ b/languages/LanguageAf.php @@ -715,7 +715,7 @@ wees om 'n bladsy te skuif.", "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.", diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php index 62e4b18b1c..a70d0a50c4 100644 --- a/languages/LanguageAr.php +++ b/languages/LanguageAr.php @@ -377,7 +377,7 @@ require_once('LanguageUtf8.php'); 'orphans' => 'الصفحات اليتيمة', 'otherlanguages' => ' لغات أخرى', 'pagemovedsub' => 'تم النقل بنجاح', -'pagemovedtext' => 'تم نقل الصفحة "[[$1]]" إلى "[[$2]]".', +'pagemovedtext' => 'تم نقل الصفحة "$1" إلى "$2".', 'passwordremindertitle' => 'تذكير بكلمة السر من ويكيبيديا', 'passwordsent' => 'تم إرسال كلمة سر جديدة إلى العنوان البريدي المسجل للمستخدم "$1". يرجى محاولة تسجيل الدخول مرة أخرى عند إستلامها.', diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php index a3200d1255..a6771d8def 100644 --- a/languages/LanguageBe.php +++ b/languages/LanguageBe.php @@ -369,7 +369,7 @@ public domain or similar free resource.
'orphans' => 'Старонкі-сіраціны', 'otherlanguages' => 'На іншых мовах', 'others' => 'іншыя', -'pagemovedtext' => 'Старонка «[[$1]]» перанесеная ў «[[$2]]».', +'pagemovedtext' => 'Старонка «$1» перанесеная ў «$2».', 'pagetitle' => '$1 - {{SITENAME}}', 'popularpages' => 'Папулярныя старонкі', 'portal' => 'Суполка', diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php index 6a3922aa6a..7a8e731dfd 100644 --- a/languages/LanguageBg.php +++ b/languages/LanguageBg.php @@ -1217,7 +1217,7 @@ $2 Показване на пренасочвания   Търсене на 'newtitle' => 'Към ново заглавие', 'movepagebtn' => 'Преместване', 'pagemovedsub' => 'Преместването беше успешно', -'pagemovedtext' => 'Страницата „[[$1]]“ беше преместена под името „[[$2]]“.', +'pagemovedtext' => 'Страницата „$1“ беше преместена под името „$2“.', 'articleexists' => 'Вече съществува страница с това име или името, което сте избрали, е невалидно. Моля, изберете друго име.', 'talkexists' => "'''Страницата беше успешно преместена, но без съответната дискусионна страница, защото под новото име има една съществуваща. Моля, обединете ги ръчно.'''", 'movedto' => 'преместена като', diff --git a/languages/LanguageBr.php b/languages/LanguageBr.php index d5904e70b9..0608da0fd0 100644 --- a/languages/LanguageBr.php +++ b/languages/LanguageBr.php @@ -999,7 +999,7 @@ En degouezh-se e rankot adenvel pe gendeuziñ ar bajenn c\'hwi hoc\'h-unan ma ka '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.", diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php index a097de17ea..5277a3e9f5 100644 --- a/languages/LanguageCa.php +++ b/languages/LanguageCa.php @@ -764,7 +764,7 @@ per reanomenar una pàgina.", "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.", diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php index bcff848657..82ab910d96 100644 --- a/languages/LanguageCs.php +++ b/languages/LanguageCs.php @@ -1172,7 +1172,7 @@ V těchto případech musíte přesunout nebo sloučit stránky manuálně, jest '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.', diff --git a/languages/LanguageCsb.php b/languages/LanguageCsb.php index d8231b7138..5ab21fce72 100644 --- a/languages/LanguageCsb.php +++ b/languages/LanguageCsb.php @@ -226,7 +226,7 @@ $wgNamespaceNamesCsb = array( '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', diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php index 5a50cc46e3..81eeb113a3 100644 --- a/languages/LanguageCy.php +++ b/languages/LanguageCy.php @@ -830,7 +830,7 @@ to move a page.", "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.", diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php index f1eb87f3ff..06e20b2d16 100644 --- a/languages/LanguageDa.php +++ b/languages/LanguageDa.php @@ -1219,7 +1219,7 @@ for at flytte en side.", "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 diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php index 31ca8151d0..94392c8f7b 100644 --- a/languages/LanguageDe.php +++ b/languages/LanguageDe.php @@ -975,7 +975,7 @@ um eine Seite zu verschieben.", "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 diff --git a/languages/LanguageHr.php b/languages/LanguageHr.php index 512e2d37b3..5d810ac9fd 100644 --- a/languages/LanguageHr.php +++ b/languages/LanguageHr.php @@ -1209,7 +1209,7 @@ ako to želite.', '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.\'\'\'', -- 2.20.1