Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303570
Change subject: Don't warn on default value of $wgExternalDiffEngine
......................................................................
Don't warn on default value of $wgExternalDiffEngine
The default is false, so don't warn in that case.
Change-Id: I39f1226eefd838b0b1767b182aa71c1794efa329
---
M includes/diff/DifferenceEngine.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/303570/1
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 84f2aca..02e1f8bd 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -926,9 +926,9 @@
} elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
// Same as above, but with no deprecation warnings
$wgExternalDiffEngine = false;
- } elseif ( !is_string( $wgExternalDiffEngine ) ) {
+ } elseif ( $wgExternalDiffEngine !== false && !is_string(
$wgExternalDiffEngine ) ) {
// And prevent people from shooting themselves in the
foot...
- wfWarn( '$wgExternalDiffEngine is set to a non-string
value, forcing it to false' );
+ wfWarn( '$wgExternalDiffEngine is neither false nor a
string, forcing it to false' );
$wgExternalDiffEngine = false;
}
--
To view, visit https://gerrit.wikimedia.org/r/303570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39f1226eefd838b0b1767b182aa71c1794efa329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
