01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99422
Change subject: Removed 'Enable simplified search bar (Vector skin only)' from
MW user Preference
......................................................................
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.In skins/Vector.php, the
if
condition for $VectorUseSimpleSearch will always execute to true, after
removing the && condition (checking for value of option) as
$wgVectorUseSimpleSearch=>true
, as given in includes/DefaultSettings.php
Bug: 52815
Change-Id: I6d8dd997a4c4a6b8fb06b4674dda5f306432c6af
---
M includes/DefaultSettings.php
M includes/Preferences.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
M skins/Vector.php
5 files changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/99422/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e9e4545..a7b673c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4034,7 +4034,6 @@
'underline' => 2,
'uselivepreview' => 0,
'usenewrc' => 0,
- 'vector-simplesearch' => 1,
'watchcreations' => 0,
'watchdefault' => 0,
'watchdeletion' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index d498770..e53c116 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1044,7 +1044,7 @@
* @param $defaultPreferences Array
*/
static function searchPreferences( $user, IContextSource $context,
&$defaultPreferences ) {
- global $wgContLang, $wgVectorUseSimpleSearch;
+ global $wgContLang;
## Search #####################################
$defaultPreferences['searchlimit'] = array(
@@ -1053,14 +1053,6 @@
'section' => 'searchoptions/displaysearchoptions',
'min' => 0,
);
-
- if ( $wgVectorUseSimpleSearch ) {
- $defaultPreferences['vector-simplesearch'] = array(
- 'type' => 'toggle',
- 'label-message' =>
'vector-simplesearch-preference',
- 'section' =>
'searchoptions/displaysearchoptions',
- );
- }
$defaultPreferences['disablesuggest'] = array(
'type' => 'toggle',
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 1bd59b2..5ccd5af 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -827,7 +827,6 @@
'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 947dfe9..74db2e2 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -200,7 +200,6 @@
'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 288b5fd..afddb76 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -428,7 +428,7 @@
<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 if ( $this->data['rtl'] ) { ?>
<?php echo $this->makeSearchButton( 'image', array(
'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath(
'images/search-rtl.png' ), 'width' => '12', 'height' => '13' ) ); ?>
--
To view, visit https://gerrit.wikimedia.org/r/99422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d8dd997a4c4a6b8fb06b4674dda5f306432c6af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
