From 3d17f0dabf8d050ef763711acfc2d812fbb1c8b0 Mon Sep 17 00:00:00 2001
From: tonythomas01 <01tonythomas@gmail.com>
Date: Wed, 4 Dec 2013 22:53:54 +0530
Subject: [PATCH] Removed "Disable search suggestions" from Mediawiki
 Preference

It's rarely used and provide more interface clutter and code complexity than
any benefit it provides.

Bug: 52812
Change-Id: I4b1d243b1b1a9da484147c4a682f44aa08a22803
---
 RELEASE-NOTES-1.23                   | 1 +
 includes/DefaultSettings.php         | 1 -
 includes/Preferences.php             | 6 ------
 includes/Skin.php                    | 4 +---
 languages/messages/MessagesEn.php    | 1 -
 maintenance/dictionary/mediawiki.dic | 1 -
 maintenance/language/messages.inc    | 1 -
 7 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 83ccf9d560..6703f89ed7 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -95,6 +95,7 @@ changes to languages because of Bugzilla reports.
   mw.toolbar.insertTags) now emits mw.log.warn when accessed.
 * User::getPageRenderingHash() was deprecated since 1.17 and has been removed.
 * The ExpandTemplates extension has been moved into MediaWiki core.
+* (bug 52812) Removed "Disable search suggestions" from Preference.
 
 == Compatibility ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e9e4545641..868c64e341 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3993,7 +3993,6 @@ $wgDefaultUserOptions = array(
 	'date' => 'default',
 	'diffonly' => 0,
 	'disablemail' => 0,
-	'disablesuggest' => 0,
 	'editfont' => 'default',
 	'editondblclick' => 0,
 	'editsection' => 1,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index d4987706e4..cf4d5c91b5 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1062,12 +1062,6 @@ class Preferences {
 			);
 		}
 
-		$defaultPreferences['disablesuggest'] = array(
-			'type' => 'toggle',
-			'label-message' => 'mwsuggest-disable',
-			'section' => 'searchoptions/displaysearchoptions',
-		);
-
 		$defaultPreferences['searcheverything'] = array(
 			'type' => 'toggle',
 			'label-message' => 'searcheverything-enable',
diff --git a/includes/Skin.php b/includes/Skin.php
index 750f319ad7..290882cf45 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -243,9 +243,7 @@ abstract class Skin extends ContextSource {
 					$modules['watch'][] = 'mediawiki.page.watch.ajax';
 				}
 
-				if ( !$user->getOption( 'disablesuggest', false ) ) {
-					$modules['search'][] = 'mediawiki.searchSuggest';
-				}
+				$modules['search'][] = 'mediawiki.searchSuggest';
 			}
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1bd59b28b8..043407f74a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1850,7 +1850,6 @@ Details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENA
 'search-interwiki-custom'          => '', # do not translate or duplicate this message to other languages
 'search-interwiki-more'            => '(more)',
 'search-relatedarticle'            => 'Related',
-'mwsuggest-disable'                => 'Disable search suggestions',
 'searcheverything-enable'          => 'Search in all namespaces',
 'searchrelated'                    => 'related',
 'searchall'                        => 'all',
diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index d35efae584..543156dd56 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -1197,7 +1197,6 @@ disabled
 disabledtranscode
 disablemail
 disablepp
-disablesuggest
 disclaimerpage
 diskussion
 displayname
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 947dfe913d..036f6e6026 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -993,7 +993,6 @@ $wgMessageStructure = array(
 		'search-interwiki-custom',
 		'search-interwiki-more',
 		'search-relatedarticle',
-		'mwsuggest-disable',
 		'searcheverything-enable',
 		'searchrelated',
 		'searchall',
-- 
2.20.1