From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 11 Jun 2009 10:49:33 +0000 (+0000)
Subject: Fix for r51667: external diff is also controlled by $wgUseExternalEditor (see include... 
X-Git-Tag: 1.31.0-rc.0~41420
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=54ebc9c5900bbaf49a2054a8742cda2a1d0da912;p=lhc%2Fweb%2Fwiklou.git

Fix for r51667: external diff is also controlled by $wgUseExternalEditor (see includes/diff/DifferenceEngine.php line 107). $wgExternalDiffEngine is used to change the difference engine's backend (wikidiff, wikidiff2, ...) and not to allow users to have their own difference engine.
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 0bc07964ab..b5c3c01f50 100644
--- 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',