X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdiff%2FDifferenceEngine.php;h=513865576372931e769f2e37c79511fe61ac2a1a;hb=90d4f56fe46140f9e97e2fa72698f98b57447fe5;hp=e6a15cef329e79ab8697990e22adca77279dc621;hpb=f506a05aaa035b96537b33244b0f18b093048e97;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index e6a15cef32..5138655763 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -966,7 +966,7 @@ class DifferenceEngine extends ContextSource {
 			wfDeprecated( "\$wgExternalDiffEngine = '{$wgExternalDiffEngine}'", '1.27' );
 			$wgExternalDiffEngine = false;
 		} elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
-			// Same as above, but with no deprecation warnings
+			wfDeprecated( "\$wgExternalDiffEngine = '{$wgExternalDiffEngine}'", '1.32' );
 			$wgExternalDiffEngine = false;
 		} elseif ( !is_string( $wgExternalDiffEngine ) && $wgExternalDiffEngine !== false ) {
 			// And prevent people from shooting themselves in the foot...
@@ -992,8 +992,6 @@ class DifferenceEngine extends ContextSource {
 	 * @return bool|string
 	 */
 	protected function textDiff( $otext, $ntext ) {
-		global $wgContLang;
-
 		$otext = str_replace( "\r\n", "\n", $otext );
 		$ntext = str_replace( "\r\n", "\n", $ntext );
 
@@ -1067,11 +1065,12 @@ class DifferenceEngine extends ContextSource {
 		}
 
 		# Native PHP diff
-		$ota = explode( "\n", $wgContLang->segmentForDiff( $otext ) );
-		$nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) );
+		$contLang = MediaWikiServices::getInstance()->getContentLanguage();
+		$ota = explode( "\n", $contLang->segmentForDiff( $otext ) );
+		$nta = explode( "\n", $contLang->segmentForDiff( $ntext ) );
 		$diffs = new Diff( $ota, $nta );
 		$formatter = new TableDiffFormatter();
-		$difftext = $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) );
+		$difftext = $contLang->unsegmentForDiff( $formatter->format( $diffs ) );
 		$difftext .= $this->debug( 'native PHP' );
 
 		return $difftext;