From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 24 Dec 2006 02:04:13 +0000 (+0000)
Subject: * (bug 8351) Fix undo for simple reverts
X-Git-Tag: 1.31.0-rc.0~54781
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=24a900b1cfbd3762d69193fbe570f919d1f66ccc;p=lhc%2Fweb%2Fwiklou.git

* (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 a3edc0ebd7..d5c0f2602f 100644
--- 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 7775710042..722ff072d9 100644
--- 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;
 					}