From: Daniel Kinzler <daniel.kinzler@wikimedia.de>
Date: Fri, 26 Oct 2012 08:05:48 +0000 (+0000)
Subject: Merge "(bug 41409) Fix regression in diffs while editing old revisions"
X-Git-Tag: 1.31.0-rc.0~21855
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=dcb0d899cb9bae36756f43ec1261bc69c07bad2a;hp=04f5501d4a9a0b31468bce92e323bb55a35191d4;p=lhc%2Fweb%2Fwiklou.git

Merge "(bug 41409) Fix regression in diffs while editing old revisions"
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 07cba04d40..d8314a3abd 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -51,6 +51,8 @@ production.
 * (bug 37020) sql.php with readline eats semicolon
 * (bug 11748) Properly handle optionally-closed HTML tags when Tidy is
   disabled, and don't wrap HTML-syntax definition lists in paragraphs.
+* (bug 41409) Diffs while editing an old revision should again diff against the
+  current revision.
 
 === API changes in 1.21 ===
 * prop=revisions can now report the contentmodel and contentformat, see docs/contenthandler.txt
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 00eb76f4e7..64167d785a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2651,7 +2651,7 @@ HTML
 				$oldContent = null;
 			}
 		} else {
-			$oldContent = $this->getOriginalContent();
+			$oldContent = $this->getCurrentContent();
 		}
 
 		$textboxContent = $this->toEditContent( $this->textbox1 );