From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 17 Jun 2009 18:23:36 +0000 (+0000)
Subject: * Show user preference 'Use live preview' if $wgLivePreview is enabled only
X-Git-Tag: 1.31.0-rc.0~41322
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=c6d6f2199e406329fd1cd7415d0c07fe2870c692;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bead513cfe..90c9b60e10 100644
--- 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 96f49b3382..4cbeaf4e95 100644
--- 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 ) {