jenkins-bot has submitted this change and it was merged.
Change subject: Removed "Disable search suggestions" from Mediawiki Preference
......................................................................
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
---
M RELEASE-NOTES-1.23
M includes/DefaultSettings.php
M includes/Preferences.php
M includes/Skin.php
M languages/messages/MessagesEn.php
M maintenance/dictionary/mediawiki.dic
M maintenance/language/messages.inc
7 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 83ccf9d..6703f89 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -95,6 +95,7 @@
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 e9e4545..868c64e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3993,7 +3993,6 @@
'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 d498770..cf4d5c9 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1062,12 +1062,6 @@
);
}
- $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 750f319..290882c 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -243,9 +243,7 @@
$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 1bd59b2..043407f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1850,7 +1850,6 @@
'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 d35efae..543156d 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -1197,7 +1197,6 @@
disabledtranscode
disablemail
disablepp
-disablesuggest
disclaimerpage
diskussion
displayname
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 947dfe9..036f6e6 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -993,7 +993,6 @@
'search-interwiki-custom',
'search-interwiki-more',
'search-relatedarticle',
- 'mwsuggest-disable',
'searcheverything-enable',
'searchrelated',
'searchall',
--
To view, visit https://gerrit.wikimedia.org/r/99163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b1d243b1b1a9da484147c4a682f44aa08a22803
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
