From: Alex Z <mrzman@users.mediawiki.org>
Date: Thu, 23 Oct 2008 21:13:08 +0000 (+0000)
Subject: Don't show a broken wikilink to Special:Allpages when searching for an invalid title.
X-Git-Tag: 1.31.0-rc.0~44633
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=e0428e5ffacf8059f69ca8195764736449746744;p=lhc%2Fweb%2Fwiklou.git

Don't show a broken wikilink to Special:Allpages when searching for an invalid title.
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 95f611e08d..3b4bda2cb4 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -159,8 +159,10 @@ class SpecialSearch {
 				}
 			}
 		}
-		$wgOut->addWikiMsg( 'searchmenu', wfEscapeWikiText( $term ) );
-		
+		if ( is_null($t) )
+			$wgOut->addWikiMsg( 'searchmenu-badtitle', wfEscapeWikiText( $term ) );
+		else
+			$wgOut->addWikiMsg( 'searchmenu', wfEscapeWikiText( $term ) );	
 		
 		$wgOut->addHtml(
 			Xml::closeElement('td').
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 599ca0f73a..96585c468a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1428,6 +1428,8 @@ Note that using the navigation links will reset this column.',
 'searchmenu-exists'                => "* Page '''[[$1]]'''",
 'searchmenu-new'                   => "* Create page '''[[$1]]'''",
 'searchhelp-url'                   => 'Project:Searching',
+'searchmenu-badtitle'              => '* "$1" is not a valid title.
+* [[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]',
 'searchmenu'                       => '* [[Special:AllPages/$1|Index]]
 * [[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]',
 'searchprofile-articles'           => 'Pages',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9a85be50f7..7e87d91ade 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -768,6 +768,7 @@ $wgMessageStructure = array(
 		'searchmenu-exists',
 		'searchmenu-new',
 		'searchhelp-url',
+		'searchmenu-badtitle',
 		'searchmenu',
 		'searchprofile-articles',
 		'searchprofile-project',