| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -639,18 +639,27 @@ |
| 640 | 640 | 'section' => 'editing/advancedediting', |
| 641 | 641 | 'label-message' => 'tog-minordefault', |
| 642 | 642 | ); |
| 643 | | - $defaultPreferences['externaleditor'] = |
| 644 | | - array( |
| 645 | | - 'type' => 'toggle', |
| 646 | | - 'section' => 'editing/advancedediting', |
| 647 | | - 'label-message' => 'tog-externaleditor', |
| 648 | | - ); |
| 649 | | - $defaultPreferences['externaldiff'] = |
| 650 | | - array( |
| 651 | | - 'type' => 'toggle', |
| 652 | | - 'section' => 'editing/advancedediting', |
| 653 | | - 'label-message' => 'tog-externaldiff', |
| 654 | | - ); |
| | 643 | + |
| | 644 | + global $wgUseExternalEditor; |
| | 645 | + if ($wgUseExternalEditor) { |
| | 646 | + $defaultPreferences['externaleditor'] = |
| | 647 | + array( |
| | 648 | + 'type' => 'toggle', |
| | 649 | + 'section' => 'editing/advancedediting', |
| | 650 | + 'label-message' => 'tog-externaleditor', |
| | 651 | + ); |
| | 652 | + } |
| | 653 | + |
| | 654 | + global $wgExternalDiffEngine; |
| | 655 | + if ($wgExternalDiffEngine) { |
| | 656 | + $defaultPreferences['externaldiff'] = |
| | 657 | + array( |
| | 658 | + 'type' => 'toggle', |
| | 659 | + 'section' => 'editing/advancedediting', |
| | 660 | + 'label-message' => 'tog-externaldiff', |
| | 661 | + ); |
| | 662 | + } |
| | 663 | + |
| 655 | 664 | $defaultPreferences['forceeditsummary'] = |
| 656 | 665 | array( |
| 657 | 666 | 'type' => 'toggle', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -181,6 +181,7 @@ |
| 182 | 182 | * (bug 18925) history.js removes class names of list elements on initialization |
| 183 | 183 | * Multiple whitespace in TOC anchors is now stripped, for consistency with the |
| 184 | 184 | link from the edit comment |
| | 185 | +* (bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine |
| 185 | 186 | |
| 186 | 187 | == API changes in 1.16 == |
| 187 | 188 | |