Revision: 51667
Author: demon
Date: 2009-06-09 23:01:00 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
(bug 19112) Preferences now respects $wgUseExternalEditor,
$wgExternalDiffEngine. Patch by jidanni.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/Preferences.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2009-06-09 22:54:36 UTC (rev 51666)
+++ trunk/phase3/RELEASE-NOTES 2009-06-09 23:01:00 UTC (rev 51667)
@@ -181,6 +181,7 @@
* (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 ==
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2009-06-09 22:54:36 UTC (rev
51666)
+++ trunk/phase3/includes/Preferences.php 2009-06-09 23:01:00 UTC (rev
51667)
@@ -639,18 +639,27 @@
'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',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
