r51736 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r51735‎ | r51736 | r51737 >
Date:10:49, 11 June 2009
Author:ialex
Status:ok
Tags:
Comment:
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) (history)

Diff [purge]

Index: trunk/phase3/includes/Preferences.php
@@ -574,6 +574,8 @@
575575 }
576576
577577 static function editingPreferences( $user, &$defaultPreferences ) {
 578+ global $wgUseExternalEditor;
 579+
578580 ## Editing #####################################
579581 $defaultPreferences['cols'] =
580582 array(
@@ -640,19 +642,14 @@
641643 'label-message' => 'tog-minordefault',
642644 );
643645
644 - global $wgUseExternalEditor;
645 - if ($wgUseExternalEditor) {
 646+ if ( $wgUseExternalEditor ) {
646647 $defaultPreferences['externaleditor'] =
647648 array(
648649 'type' => 'toggle',
649650 'section' => 'editing/advancedediting',
650651 'label-message' => 'tog-externaleditor',
651652 );
652 - }
653 -
654 - global $wgExternalDiffEngine;
655 - if ($wgExternalDiffEngine) {
656 - $defaultPreferences['externaldiff'] =
 653+ $defaultPreferences['externaldiff'] =
657654 array(
658655 'type' => 'toggle',
659656 'section' => 'editing/advancedediting',

Follow-up revisions

RevisionCommit summaryAuthorDate
r54891* removed entries for removed functionnalities...ialex21:39, 12 August 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r51667(bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEng...demon23:01, 9 June 2009

Status & tagging log