https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112821

Revision: 112821
Author:   hashar
Date:     2012-03-01 17:33:46 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
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

Property Changed:
----------------
    branches/wmf/1.19wmf1/includes/EditPage.php

Modified: branches/wmf/1.19wmf1/includes/EditPage.php
===================================================================
--- branches/wmf/1.19wmf1/includes/EditPage.php 2012-03-01 17:32:50 UTC (rev 
112820)
+++ branches/wmf/1.19wmf1/includes/EditPage.php 2012-03-01 17:33:46 UTC (rev 
112821)
@@ -2306,7 +2306,7 @@
        function showDiff() {
                global $wgUser, $wgContLang, $wgParser, $wgOut;
 
-               $oldtext = $this->getOriginalContent();
+               $oldtext = $this->mArticle->getRawText();
                $newtext = $this->mArticle->replaceSection(
                        $this->section, $this->textbox1, $this->summary, 
$this->edittime );
 


Property changes on: branches/wmf/1.19wmf1/includes/EditPage.php
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/JSTesting/includes/EditPage.php:100352-107913
/branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/new-installer/phase3/includes/EditPage.php:43664-66004
/branches/sqlite/includes/EditPage.php:58211-58321
/branches/wmf/1.18wmf1/includes/EditPage.php:97508,111667
/branches/wmf-deployment/includes/EditPage.php:53381
/trunk/phase3/includes/EditPage.php:111029,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


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to