Revision: 51736
Author: ialex
Date: 2009-06-11 10:49:33 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/phase3/includes/Preferences.php
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2009-06-11 10:30:16 UTC (rev
51735)
+++ trunk/phase3/includes/Preferences.php 2009-06-11 10:49:33 UTC (rev
51736)
@@ -574,6 +574,8 @@
}
static function editingPreferences( $user, &$defaultPreferences ) {
+ global $wgUseExternalEditor;
+
## Editing #####################################
$defaultPreferences['cols'] =
array(
@@ -640,19 +642,14 @@
'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',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
