From: Chad Horohoe <chadh@wikimedia.org>
Date: Mon, 12 May 2014 18:10:18 +0000 (-0700)
Subject: Remove "Help/Project" profile from Special:Search
X-Git-Tag: 1.31.0-rc.0~15565^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=1cb1ac62780fccce4cae529891391484c11cf5c4;p=lhc%2Fweb%2Fwiklou.git

Remove "Help/Project" profile from Special:Search

The vast majority of wikis have an empty help namespace and
searching project pages is mostly an advanced search feature.

Cluttering the UI with an extra tab that's (most likely) rarely
clicked isn't helping anyone.

Change-Id: I0c448bcee877e027ff95c96812aac86d89d4eb32
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 64512c83a5..b7116e7cfb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5320,17 +5320,6 @@ $wgNamespacesToBeSearchedDefault = array(
 	NS_MAIN => true,
 );
 
-/**
- * Namespaces to be searched when user clicks the "Help" tab
- * on Special:Search.
- *
- * Same format as $wgNamespacesToBeSearchedDefault.
- */
-$wgNamespacesToBeSearchedHelp = array(
-	NS_PROJECT => true,
-	NS_HELP => true,
-);
-
 /**
  * If set to true the 'searcheverything' preference will be effective only for
  * logged-in users.
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 907047e947..3d0655b723 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -431,17 +431,6 @@ class SearchEngine {
 		return $formatted;
 	}
 
-	/**
-	 * Return the help namespaces to be shown on Special:Search
-	 *
-	 * @return array
-	 */
-	public static function helpNamespaces() {
-		global $wgNamespacesToBeSearchedHelp;
-
-		return array_keys( $wgNamespacesToBeSearchedHelp, true );
-	}
-
 	/**
 	 * Return a 'cleaned up' search string
 	 *
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 2713a5f998..33bd87f518 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -30,7 +30,7 @@
 class SpecialSearch extends SpecialPage {
 	/**
 	 * Current search profile. Search profile is just a name that identifies
-	 * the active search tab on the search page (content, help, discussions...)
+	 * the active search tab on the search page (content, discussions...)
 	 * For users tt replaces the set of enabled namespaces from the query
 	 * string when applicable. Extensions can add new profiles with hooks
 	 * with custom search options just for that profile.
@@ -975,14 +975,6 @@ class SpecialSearch extends SpecialPage {
 				'tooltip' => 'searchprofile-images-tooltip',
 				'namespaces' => array( NS_FILE ),
 			),
-			'help' => array(
-				'message' => 'searchprofile-project',
-				'tooltip' => 'searchprofile-project-tooltip',
-				'namespaces' => SearchEngine::helpNamespaces(),
-				'namespace-messages' => SearchEngine::namespacesAsText(
-					SearchEngine::helpNamespaces()
-				),
-			),
 			'all' => array(
 				'message' => 'searchprofile-everything',
 				'tooltip' => 'searchprofile-everything-tooltip',
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 1c617f7c82..006278ee1b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -882,12 +882,10 @@
 	"searchmenu-new": "<strong>Create the page \"[[:$1]]\" on this wiki!</strong> {{PLURAL:$2|0=|See also the page found with your search.|See also the search results found.}}",
 	"searchmenu-new-nocreate": "",
 	"searchprofile-articles": "Content pages",
-	"searchprofile-project": "Help and Project pages",
 	"searchprofile-images": "Multimedia",
 	"searchprofile-everything": "Everything",
 	"searchprofile-advanced": "Advanced",
 	"searchprofile-articles-tooltip": "Search in $1",
-	"searchprofile-project-tooltip": "Search in $1",
 	"searchprofile-images-tooltip": "Search for files",
 	"searchprofile-everything-tooltip": "Search all of content (including talk pages)",
 	"searchprofile-advanced-tooltip": "Search in custom namespaces",