From: Seb35 <seb35wikipedia@gmail.com>
Date: Sat, 9 Jul 2016 08:07:49 +0000 (+0200)
Subject: Handle the default value of $wgExternalDiffEngine without warning
X-Git-Tag: 1.31.0-rc.0~6420
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%24wgLogo?a=commitdiff_plain;h=ff397feea812f5a068afa55f3b883746cc6b7956;p=lhc%2Fweb%2Fwiklou.git

Handle the default value of $wgExternalDiffEngine without warning

The default value (false) was not handled by the recent depreciation warnings
in 037f056, and was triggering the last warning. This removes this warning.

Change-Id: If7fe92d874eb10525a72f6d3a97f00117c79acc1
---

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 6bb88747de..af5fbf3346 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -894,7 +894,7 @@ class DifferenceEngine extends ContextSource {
 		} elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
 			// Same as above, but with no deprecation warnings
 			$wgExternalDiffEngine = false;
-		} elseif ( !is_string( $wgExternalDiffEngine ) ) {
+		} elseif ( !is_string( $wgExternalDiffEngine ) && $wgExternalDiffEngine !== false ) {
 			// And prevent people from shooting themselves in the foot...
 			wfWarn( '$wgExternalDiffEngine is set to a non-string value, forcing it to false' );
 			$wgExternalDiffEngine = false;