* Remove project+main search to reduce clutter

* Tweak search messages

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 0772c9f..d586749 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -290,8 +290,6 @@ class SpecialSearch {
                        $this->active = 'all';
                elseif( $this->namespaces === SearchEngine::defaultNamespaces() )
                        $this->active = 'default';
-               elseif( $this->namespaces === SearchEngine::defaultAndProjectNamespaces() )
-                       $this->active = 'withproject';
                elseif( $this->namespaces === SearchEngine::projectNamespaces() )
                        $this->active = 'project';
                else
@@ -667,7 +665,8 @@ class SpecialSearch {
                        $out .= $this->makeSearchLink( $imageTextForm, array( NS_IMAGE ) , $m, $tt );
                }
                $out .= $sep;
-                       
+               
+               /*
                $m = wfMsg( 'searchprofile-articles-and-proj' );
                $tt = wfMsg( 'searchprofile-project-tooltip', 
                        implode( ', ', SearchEngine::namespacesAsText( SearchEngine::defaultAndProjectNamespaces() ) ) );
@@ -677,6 +676,7 @@ class SpecialSearch {
                        $out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultAndProjectNamespaces(), $m, $tt );
                }
                $out .= $sep;
+               */
                
                $m = wfMsg( 'searchprofile-project' );
                $tt = wfMsg( 'searchprofile-project-tooltip', 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e3a6ce1..2284cf2 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1449,8 +1449,8 @@ You can [[:\$1|create this page]].",
 'searchmenu-prefix'                => '[[Special:PrefixIndex/$1|Browse pages with this prefix]]',
 'searchmenu-help'                  => '[[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]?', # do not translate or duplicate this message to other languages
 'searchprofile-articles'           => 'Content pages',
-'searchprofile-articles-and-proj'  => 'Content pages & Project',
-'searchprofile-project'            => 'Project',
+'searchprofile-articles-and-proj'  => 'Content & project pages',
+'searchprofile-project'            => 'Project pages',
 'searchprofile-images'             => 'Files',
 'searchprofile-everything'         => 'Everything',
 'searchprofile-advanced'           => 'Advanced',