From: tonythomas01 <01tonythomas@gmail.com>
Date: Thu, 5 Dec 2013 16:53:16 +0000 (+0530)
Subject: Removed 'Enable simplified search bar (Vector skin only)' from MW user Preference
X-Git-Tag: 1.31.0-rc.0~16877
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=11c04f9ecbaf178cd0ccde4f388b7fd1231749bb;p=lhc%2Fweb%2Fwiklou.git

Removed 'Enable simplified search bar (Vector skin only)' from MW user Preference

The vector-simplesearch preference is enabled by default since version 1.22.
The option is removed to decrease the clutter in the preference page

Bug: 52815
Change-Id: I6d8dd997a4c4a6b8fb06b4674dda5f306432c6af
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index b1be60bc11..9664f1f107 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -239,6 +239,8 @@ changes to languages because of Bugzilla reports.
   altered to reset all rate-limited thumbnails at once.
 * (bug 56572) Builds of the OOjs and OOjs UI libraries are now available.
 * mw.loader.go and mw.loader.version have been removed.
+* (bug 52815) Preference "Enable simplified search bar (Vector skin only)"
+  was removed.
 
 ==== Removed classes ====
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b9f20cff91..b3e04d0473 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4029,7 +4029,6 @@ $wgDefaultUserOptions = array(
 	'underline' => 2,
 	'uselivepreview' => 0,
 	'usenewrc' => 0,
-	'vector-simplesearch' => 1,
 	'watchcreations' => 1,
 	'watchdefault' => 1,
 	'watchdeletion' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c85a00faf3..9a16383459 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1030,15 +1030,7 @@ class Preferences {
 	 * @param $defaultPreferences Array
 	 */
 	static function searchPreferences( $user, IContextSource $context, &$defaultPreferences ) {
-		global $wgContLang, $wgVectorUseSimpleSearch;
-
-		if ( $wgVectorUseSimpleSearch ) {
-			$defaultPreferences['vector-simplesearch'] = array(
-				'type' => 'toggle',
-				'label-message' => 'vector-simplesearch-preference',
-				'section' => 'searchoptions/displaysearchoptions',
-			);
-		}
+		global $wgContLang;
 
 		$defaultPreferences['searcheverything'] = array(
 			'type' => 'toggle',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a1192fb2ce..c382bbf9dc 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -825,7 +825,6 @@ future releases. Also note that since each list value is wrapped in a unique
 'vector-action-protect'          => 'Protect',
 'vector-action-undelete'         => 'Undelete',
 'vector-action-unprotect'        => 'Change protection',
-'vector-simplesearch-preference' => 'Enable simplified search bar (Vector skin only)',
 'vector-view-create'             => 'Create',
 'vector-view-edit'               => 'Edit',
 'vector-view-history'            => 'View history',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 935dae7877..73f5ca2f4b 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -196,7 +196,6 @@ $wgMessageStructure = array(
 		'vector-action-protect',
 		'vector-action-undelete',
 		'vector-action-unprotect',
-		'vector-simplesearch-preference',
 		'vector-view-create',
 		'vector-view-edit',
 		'vector-view-history',
diff --git a/skins/Vector.php b/skins/Vector.php
index b44b91443f..899a27220d 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -428,7 +428,7 @@ class VectorTemplate extends BaseTemplate {
 <div id="p-search" role="search">
 	<h3<?php $this->html( 'userlangattributes' ) ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
 	<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
-		<?php if ( $wgVectorUseSimpleSearch && $this->getSkin()->getUser()->getOption( 'vector-simplesearch' ) ) { ?>
+		<?php if ( $wgVectorUseSimpleSearch ) { ?>
 			<div id="simpleSearch">
 		<?php } else { ?>
 			<div>