Restore 18905, but instead of displaying the Preview, display Show Changes. Also...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5c36690..c53389c 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -122,6 +122,7 @@ class EditPage {
                                                # Inform the user of our success and set an automatic edit summary
                                                $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-success' ) );
                                                $this->summary = wfMsgForContent( 'undo-summary', $undo, $undorev->getUserText() );
+                                               $this->formtype = 'diff';
                                        } else {
                                                # Warn the user that something went wrong
                                                $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-failure' ) );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 587e1ec..8294df0 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1021,7 +1021,8 @@ the text into a text file and save it for later.</strong>',
 You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].',
 
 # "Undo" feature
-'undo-success' => 'The edit has been undone. Please confirm, and then save the changes below.',
+'undo-success' => 'The edit can be undone. Please check the diff below to verify that this is what you want to do, and then save the changes below to finish undoing 
+the edit.',
 'undo-failure' => 'The edit could not be undone due to conflicting intermediate edits.',
 'undo-summary' => 'Undo revision $1 by [[Special:Contributions/$2]] ([[User talk:$2]])',