From 7ecd84c268486f95d2ad0b8e8960dcdd78dee698 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 23 Nov 2008 16:18:06 +0000
Subject: [PATCH] * Remove project+main search to reduce clutter * Tweak search
 messages

---
 includes/specials/SpecialSearch.php | 6 +++---
 languages/messages/MessagesEn.php   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 0772c9fb50..d586749eeb 100644
--- 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 e3a6ce16b4..2284cf209c 100644
--- 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',
-- 
2.20.1