From c35d1ce205003188a9050fdbcb6c01cf40df114e Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 2 Apr 2016 13:44:17 +0200 Subject: [PATCH] Remove DifferenceEngine::generateDiffBody() Bug: T122754 Change-Id: Iedd319fa5e7b7218ee5341f18f31a8f1101b5eee --- RELEASE-NOTES-1.28 | 1 + includes/diff/DifferenceEngine.php | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index 41e94be634..9acd1d8049 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -92,6 +92,7 @@ changes to languages because of Phabricator reports. * The 'ParserLimitReportFormat' hook was removed. * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is disabled. +* DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21). == Compatibility == diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 949a0acc7c..33955b2d41 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -819,21 +819,6 @@ class DifferenceEngine extends ContextSource { return $this->generateTextDiffBody( $otext, $ntext ); } - /** - * Generate a diff, no caching - * - * @param string $otext Old text, must be already segmented - * @param string $ntext New text, must be already segmented - * - * @return bool|string - * @deprecated since 1.21, use generateContentDiffBody() instead! - */ - public function generateDiffBody( $otext, $ntext ) { - ContentHandler::deprecated( __METHOD__, "1.21" ); - - return $this->generateTextDiffBody( $otext, $ntext ); - } - /** * Generate a diff, no caching * -- 2.20.1