From ff397feea812f5a068afa55f3b883746cc6b7956 Mon Sep 17 00:00:00 2001 From: Seb35 Date: Sat, 9 Jul 2016 10:07:49 +0200 Subject: [PATCH] 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 --- includes/diff/DifferenceEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.20.1