* Show user preference 'Use live preview' if $wgLivePreview is enabled only

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bead513..90c9b60 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -186,6 +186,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 19170) Special:Version should follow the content language direction
 * (bug 19160) maintenance/purgeOldText.inc is now compatible with PostgreSQL
 * Fixed performance regression in "bad image list" feature
+* Show user preference 'Use live preview' if $wgLivePreview is enabled only
 
 == API changes in 1.16 ==
 

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 96f49b3..4cbeaf4 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -574,7 +574,7 @@ class Preferences {
        }
        
        static function editingPreferences( $user, &$defaultPreferences ) {
-               global $wgUseExternalEditor;
+               global $wgUseExternalEditor, $wgLivePreview;
 
                ## Editing #####################################
                $defaultPreferences['cols'] =
@@ -663,12 +663,14 @@ class Preferences {
                                        'section' => 'editing/advancedediting',
                                        'label-message' => 'tog-forceeditsummary',
                                );
-               $defaultPreferences['uselivepreview'] =
-                               array(
-                                       'type' => 'toggle',
-                                       'section' => 'editing/advancedediting',
-                                       'label-message' => 'tog-uselivepreview',
-                               );
+               if ( $wgLivePreview ) {
+                       $defaultPreferences['uselivepreview'] =
+                                       array(
+                                               'type' => 'toggle',
+                                               'section' => 'editing/advancedediting',
+                                               'label-message' => 'tog-uselivepreview',
+                                       );
+               }
        }
        
        static function rcPreferences( $user, &$defaultPreferences ) {