Fix for r51667: external diff is also controlled by $wgUseExternalEditor (see include...

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 0bc0796..b5c3c01 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -574,6 +574,8 @@ class Preferences {
        }
        
        static function editingPreferences( $user, &$defaultPreferences ) {
+               global $wgUseExternalEditor;
+
                ## Editing #####################################
                $defaultPreferences['cols'] =
                                array(
@@ -640,19 +642,14 @@ class Preferences {
                                        'label-message' => 'tog-minordefault',
                                );
 
-               global $wgUseExternalEditor;
-               if ($wgUseExternalEditor) {
+               if ( $wgUseExternalEditor ) {
                        $defaultPreferences['externaleditor'] =
                                        array(
                                                'type' => 'toggle',
                                                'section' => 'editing/advancedediting',
                                                'label-message' => 'tog-externaleditor',
                                        );
-               }
-
-               global $wgExternalDiffEngine;
-               if ($wgExternalDiffEngine) {
-                 $defaultPreferences['externaldiff'] =
+                       $defaultPreferences['externaldiff'] =
                                        array(
                                                'type' => 'toggle',
                                                'section' => 'editing/advancedediting',