From: Gergő Tisza <tgr.huwiki@gmail.com>
Date: Wed, 11 Jul 2018 11:11:25 +0000 (+0200)
Subject: Deprecate $wgExternalDiffEngine = 'wikidiff2'
X-Git-Tag: 1.34.0-rc.0~4647^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=2300ef7ec40e0f8faf468aba3951219a0d51e640;p=lhc%2Fweb%2Fwiklou.git

Deprecate $wgExternalDiffEngine = 'wikidiff2'

The value 'wikidiff2' for $wgExternalDiffEngine was obsoleted in
I32b670ebf6 but not formally deprecated. Let's do that now.

Change-Id: Ie5ccd3895544cf393885b84d38eca6003c79e8ad
Depends-On: I33c6207cfc5fb66987d31818bc27055f597d28c7
---

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index c91ae7d24f..abd9f89c84 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -287,6 +287,8 @@ because of Phabricator reports.
   mNewPage, mOldContent, mNewContent, mRevisionsLoaded, mTextLoaded and
   mCacheHit is deprecated. Use getOldid() / getNewid() for the first two,
   do your own lookup for page/content. mNewRev / mOldRev remains public.
+* The $wgExternalDiffEngine value 'wikidiff2' is deprecated. To use wikidiff2
+  just enable the PHP extension, and it will be autodetected.
 
 === Other changes in 1.32 ===
 * (T198811) The following tables have had their UNIQUE indexes turned into
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index e6a15cef32..aa0a1f782f 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...