r112821 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r112820‎ | r112821 | r112822 >
Date:17:33, 1 March 2012
Author:hashar
Status:ok
Tags:
Comment:
MFT to 1.19wmf1 r112819

Bug 34849 diff during editing an old version compares to the old
version instead of the current one.
Modified paths:
  • /branches/wmf/1.19wmf1/includes/EditPage.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/includes/EditPage.php
——@@ -2306,7 +2306,7 @@
23072307 function showDiff() {
23082308 global $wgUser, $wgContLang, $wgParser, $wgOut;
23092309
2310 - $oldtext = $this->getOriginalContent();
 2310+ $oldtext = $this->mArticle->getRawText();
23112311 $newtext = $this->mArticle->replaceSection(
23122312 $this->section, $this->textbox1, $this->summary, $this->edittime );
23132313
Property changes on: branches/wmf/1.19wmf1/includes/EditPage.php
___________________________________________________________________
Added: svn:mergeinfo
23142314 Merged /branches/sqlite/includes/EditPage.php:r58211-58321
23152315 Merged /trunk/phase3/includes/EditPage.php:r111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112819
23162316 Merged /branches/new-installer/phase3/includes/EditPage.php:r43664-66004
23172317 Merged /branches/wmf-deployment/includes/EditPage.php:r53381
23182318 Merged /branches/JSTesting/includes/EditPage.php:r100352-107913
23192319 Merged /branches/REL1_15/phase3/includes/EditPage.php:r51646
23202320 Merged /branches/wmf/1.18wmf1/includes/EditPage.php:r97508,111667

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r112819* (bug 34849) Diff when editing an old version show the comparison with the c...ialex17:29, 1 March 2012

Status & tagging log