From 24a900b1cfbd3762d69193fbe570f919d1f66ccc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 24 Dec 2006 02:04:13 +0000 Subject: [PATCH] * (bug 8351) Fix undo for simple reverts Was keeping the 'after' instead of 'before' text when merge algorithm was skipped... --- RELEASE-NOTES | 2 ++ includes/EditPage.php | 1 + 2 files changed, 3 insertions(+) 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; } -- 2.20.1