From 736e61af522783e50138af72eb1fc2c8bfffb9e5 Mon Sep 17 00:00:00 2001
From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Sun, 26 Nov 2006 11:15:35 +0000
Subject: [PATCH] Add message explaining if undoing an edit failed.

---
 includes/EditPage.php             | 4 ++++
 languages/messages/MessagesEn.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index cd50c7be53..860f1abd7d 100644
--- 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 a429bdc174..1c89f74493 100644
--- 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 
-- 
2.20.1