X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdiff%2FDifferenceEngine.php;h=e2345ca2ba355598a7c1f333c7d9d532b1e05fe4;hb=e626da092fa3bd71529868cad5bc35389f98d2b1;hp=1508cf1e83d8374d06e95a691e61c46869d22783;hpb=052d2ba86aa56209e060f882bd6c250f74920549;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 1508cf1e83..e2345ca2ba 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -870,8 +870,8 @@ class DifferenceEngine extends ContextSource {
 		$otext = str_replace( "\r\n", "\n", $otext );
 		$ntext = str_replace( "\r\n", "\n", $ntext );
 
-		if ( $wgExternalDiffEngine == 'wikidiff' ) {
-			wfDeprecated( 'wikidiff support', '1.27' );
+		if ( $wgExternalDiffEngine == 'wikidiff' || $wgExternalDiffEngine == 'wikidiff3' ) {
+			wfDeprecated( "\$wgExternalDiffEngine = '{$wgExternalDiffEngine}'", '1.27' );
 			$wgExternalDiffEngine = false;
 		}
 
@@ -884,7 +884,7 @@ class DifferenceEngine extends ContextSource {
 
 				return $text;
 			}
-		} elseif ( $wgExternalDiffEngine != 'wikidiff3' && $wgExternalDiffEngine !== false ) {
+		} elseif ( $wgExternalDiffEngine !== false ) {
 			# Diff via the shell
 			$tmpDir = wfTempDir();
 			$tempName1 = tempnam( $tmpDir, 'diff_' );