Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
Alexandre Emsenhuber 2009-06-11 10:49:33 +00:00
parent b6acef6319
commit 54ebc9c590
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/Preferences.php
View file

@ -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',