From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 11 Dec 2008 23:55:44 +0000 (+0000)
Subject: Self revert. Need to focus when there's no results, not only when there's no term.
X-Git-Tag: 1.31.0-rc.0~44025
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=493e9404be2f3ff70bf1d6a32786ac36108d5906;p=lhc%2Fweb%2Fwiklou.git

Self revert. Need to focus when there's no results, not only when there's no term.
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index bb493cc555..880af73f14 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -619,7 +619,7 @@ class SpecialSearch {
 		if( $t != null && count($this->namespaces) === 1 ) {
 			$out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
 		}
-		return $term != '' ? $this->powerSearchFocus() : '' .
+		return $this->powerSearchFocus() .
 			Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
 			Xml::element( 'legend', null, wfMsg('powersearch-legend') ) .
 			$this->formHeader($term) . $out . 
@@ -724,7 +724,7 @@ class SpecialSearch {
 		global $wgScript;
 		$searchTitle = SpecialPage::getTitleFor( 'Search' );
 		$searchable = SearchEngine::searchableNamespaces();
-		$out = $term != '' ? $this->searchFocus() : '';
+		$out = $this->searchFocus();
 		$out .= Xml::openElement( 'form', array( 'id' => 'search', 'method' => 'get', 'action' => $wgScript ) );
 		$out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
 		// If searching several, but not all namespaces, show what we are searching.