From a7505905c4fea1a35670916b25795fd3da5f8ed7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Thu, 23 Feb 2006 20:03:51 +0000
Subject: [PATCH] * Make Live Preview an user preference, still controllable by
 the global variable

---
 RELEASE-NOTES                   | 1 +
 includes/EditPage.php           | 2 +-
 includes/SpecialPreferences.php | 3 ++-
 languages/Language.php          | 2 ++
 languages/Messages.php          | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a276998674..c9c977c7e7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -650,6 +650,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4974) Don't follow redirected talk page on "new messages" link
 * (bug 4970) Make category paging limits configurable
 * (bug 4535) Warn user when editing CSS or JS subpage of a skin that doesn't exist
+* Make Live Preview an user preference, still controllable by the global variable
 
 === Caveats ===
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 47f531148e..46d9e8d76c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -930,7 +930,7 @@ class EditPage {
 		$buttons['diff'] = wfElement('input', $temp, '');
 
 		global $wgLivePreview;
-		if ( $wgLivePreview ) {
+		if ( $wgLivePreview && $wgUser->getOption( 'uselivepreview' ) ) {
 			$temp = array(
 				'id'        => 'wpPreview',
 				'name'      => 'wpPreview',
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 5d229e7abd..872d16c948 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -813,7 +813,8 @@ class PreferencesForm {
 				'watchdefault',
 				'minordefault',
 				'externaleditor',
-				'externaldiff' )
+				'externaldiff',
+				'uselivepreview', )
 			) . '</fieldset>'
 		);
 
diff --git a/languages/Language.php b/languages/Language.php
index 1df20e6a8a..96753f03b6 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -83,6 +83,7 @@ if(isset($wgExtraNamespaces)) {
 	'externaldiff' 		=> 0,
 	'showjumplinks'		=> 1,
 	'numberheadings'	=> 0,
+	'uselivepreview'	=> 0,
 );
 
 /* private */ $wgQuickbarSettingsEn = array(
@@ -156,6 +157,7 @@ $wgDateFormatsEn = array(
 	'externaleditor',
 	'externaldiff',
 	'showjumplinks',
+	'uselivepreview',
 );
 
 /* private */ $wgBookstoreListEn = array(
diff --git a/languages/Messages.php b/languages/Messages.php
index ca7d0978c8..a20cf3389b 100644
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -59,6 +59,7 @@ parent class in order maintain consistency across languages.
 'tog-externaleditor' => 'Use external editor by default',
 'tog-externaldiff' => 'Use external diff by default',
 'tog-showjumplinks' => 'Enable "jump to" accessibility links',
+'tog-uselivepreview' => 'Use live preview (JavaScript) (Experimental)',
 
 'underline-always' => 'Always',
 'underline-never' => 'Never',
-- 
2.20.1