* (bug 8351) Fix undo for simple reverts

Was keeping the 'after' instead of 'before' text when merge algorithm was skipped...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a3edc0e..d5c0f26 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -400,6 +400,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * {{PLURAL:}} now handles formatted numbers correctly
 * (bug 8331) Added the change size value to watchlists; therefor made
   watchlists use RecentChange::newFromRow() instead of newFromCurRow()
+* (bug 8351) Fix undo for simple reverts
+
 
 == Languages updated ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7775710..722ff07 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -114,6 +114,7 @@ class EditPage {
                                        if ($currev_text != $undorev_text) {
                                                $result = wfMerge($undorev_text, $oldrev_text, $currev_text, $text);
                                        } else {
+                                               $text = $oldrev_text;
                                                $result = true;
                                        }