From cba211ee3fc941f0e5d5ef9872621457a63bd364 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 9 Jun 2009 23:01:00 +0000
Subject: [PATCH] (bug 19112) Preferences now respects $wgUseExternalEditor,
 $wgExternalDiffEngine. Patch by jidanni.

---
 RELEASE-NOTES            |  1 +
 includes/Preferences.php | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0882bedda8..232b091254 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -181,6 +181,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18925) history.js removes class names of list elements on initialization
 * Multiple whitespace in TOC anchors is now stripped, for consistency with the
   link from the edit comment
+* (bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine
 
 == API changes in 1.16 ==
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 953f71d13e..d0135cecee 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -639,18 +639,27 @@ class Preferences {
 					'section' => 'editing/advancedediting',
 					'label-message' => 'tog-minordefault',
 				);
-		$defaultPreferences['externaleditor'] =
-				array(
-					'type' => 'toggle',
-					'section' => 'editing/advancedediting',
-					'label-message' => 'tog-externaleditor',
-				);
-		$defaultPreferences['externaldiff'] =
-				array(
-					'type' => 'toggle',
-					'section' => 'editing/advancedediting',
-					'label-message' => 'tog-externaldiff',
-				);
+
+		global $wgUseExternalEditor;
+		if ($wgUseExternalEditor) {
+			$defaultPreferences['externaleditor'] =
+					array(
+						'type' => 'toggle',
+						'section' => 'editing/advancedediting',
+						'label-message' => 'tog-externaleditor',
+					);
+		}
+
+		global $wgExternalDiffEngine;
+		if ($wgExternalDiffEngine) {
+		  $defaultPreferences['externaldiff'] =
+					array(
+						'type' => 'toggle',
+						'section' => 'editing/advancedediting',
+						'label-message' => 'tog-externaldiff',
+					);
+		}
+
 		$defaultPreferences['forceeditsummary'] =
 				array(
 					'type' => 'toggle',
-- 
2.20.1