From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Sat, 2 Apr 2016 11:44:17 +0000 (+0200)
Subject: Remove DifferenceEngine::generateDiffBody()
X-Git-Tag: 1.31.0-rc.0~6203^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=c35d1ce205003188a9050fdbcb6c01cf40df114e;p=lhc%2Fweb%2Fwiklou.git

Remove DifferenceEngine::generateDiffBody()

Bug: T122754
Change-Id: Iedd319fa5e7b7218ee5341f18f31a8f1101b5eee
---

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
 	 *