From 05817c7361336b24466f60b2460a99595ce60e59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Thu, 20 Sep 2018 22:39:55 -0700 Subject: [PATCH] Support multi-content diffs on Special:Undelete Bug: T201848 BUg: T202920 Change-Id: Ia9eedb457c1db6badfd4f81d0bc8516c4f5ccbf2 --- includes/specials/SpecialUndelete.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index a92982040b..f8703cd227 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -545,15 +545,9 @@ class SpecialUndelete extends SpecialPage { $diffContext->setWikiPage( WikiPage::factory( $currentRev->getTitle() ) ); $diffEngine = $currentRev->getContentHandler()->createDifferenceEngine( $diffContext ); + $diffEngine->setRevisions( $previousRev->getRevisionRecord(), $currentRev->getRevisionRecord() ); $diffEngine->showDiffStyle(); - - $formattedDiff = $diffEngine->generateContentDiffBody( - $previousRev->getContent( Revision::FOR_THIS_USER, $this->getUser() ), - $currentRev->getContent( Revision::FOR_THIS_USER, $this->getUser() ) - ); - - $formattedDiff = $diffEngine->addHeader( - $formattedDiff, + $formattedDiff = $diffEngine->getDiff( $this->diffHeader( $previousRev, 'o' ), $this->diffHeader( $currentRev, 'n' ) ); -- 2.20.1