Add message explaining if undoing an edit failed.

diff --git a/includes/EditPage.php b/includes/EditPage.php
index cd50c7b..860f1ab 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -113,6 +113,10 @@ class EditPage {
                                        if (!$result) {
                                                #Undoing failed. Bailing out with regular revision text.
                                                $text = $currev_text;
+
+                                               #Give a warning
+                                               $this->editFormTextTop = "<h2>" . wfMsg('undofailed') . "</h2><br/>\n" .
+                                                                       wfMsg('explainundofailed');
                                        }
                                }
                        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a429bdc..1c89f74 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -997,6 +997,10 @@ the text into a text file and save it for later.</strong>',
 'nocreatetitle' => 'Page creation limited',
 'nocreatetext' => 'This site has restricted the ability to create new pages.
 You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].',
+'undofailed' => 'Undo Failed',
+'explainundofailed' => 'The edit could not be undone because of conflicting intermediate edits. Please manually undo the edits',
+
+# Account creation failure
 'cantcreateaccounttitle' => 'Can\'t create account',
 'cantcreateaccounttext' => 'Account creation from this IP address (<b>$1</b>) has been blocked. 
 This is probably due to persistent vandalism from your school or Internet service