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

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 07cba04..d8314a3 100644 (file)
--- 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 00eb76f..64167d7 100644 (file)
--- 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 );