Merge "Remove "Help/Project" profile from Special:Search"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e156792..9df0e08 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5323,17 +5323,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 907047e..3d0655b 100644 (file)
--- 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 2713a5f..33bd87f 100644 (file)
--- 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 2ed480e..85e1bdc 100644 (file)
--- 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",