Merge "Revert "If rev_content_model is null, use page_content_model.""

[lhc/web/wiklou.git] / includes / diff / DifferenceEngine.php

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 6bb8874..af5fbf3 100644 (file)
--- 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;