From acdb3e4bf9f7064d0ba8cccf843cac972fe093e2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 14 Mar 2008 20:24:36 +0000 Subject: [PATCH] Revert r31989 -- bizarre 'searchtext' message consisting of '$1' makes no sense --- includes/SpecialSearch.php | 15 ++++----------- languages/messages/MessagesEn.php | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php index 98852c4506..e20d8389c2 100644 --- a/includes/SpecialSearch.php +++ b/includes/SpecialSearch.php @@ -173,8 +173,6 @@ class SpecialSearch { } $textMatches = $search->searchText( $term ); - $wgOut->addHTML( '
' ); - $num = ( $titleMatches ? $titleMatches->numRows() : 0 ) + ( $textMatches ? $textMatches->numRows() : 0); if ( $num > 0 ) { @@ -195,8 +193,6 @@ class SpecialSearch { ($num < $this->limit) ); $wgOut->addHTML( "

{$prevnext}

\n" ); } - - $wgOut->addHTML( "
\n" ); if( $titleMatches ) { if( $titleMatches->numRows() ) { @@ -487,7 +483,7 @@ class SpecialSearch { $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) . Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', array( ), wfMsg( 'searchbutton' ) ) . + Xml::element( 'legend', array( ), wfMsg( 'powersearch' ) ) . Xml::hidden( 'title', 'Special:Search' ) . wfMsgExt( 'powersearchtext', array( 'parse', 'replaceafter' ), $namespaces, $redirect, $searchField, @@ -508,17 +504,14 @@ class SpecialSearch { function shortDialog($term) { global $wgScript; - $form = Xml::hidden( 'title', 'Special:Search' ); - $form .= Xml::input( 'search', 50, $term, - array( 'id' => 'searchBox' ) ).' '; - $form .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) ); - $out = Xml::openElement( 'form', array( 'id' => 'search', 'method' => 'get', 'action' => $wgScript )); - $out .= wfMsgExt( 'searchtext', array( 'parse', 'replaceafter' ), $form ); + $out .= Xml::hidden( 'title', 'Special:Search' ); + $out .= Xml::input( 'search', 50, $term ) . ' '; + $out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) ); $out .= Xml::closeElement( 'form' ); return $out; diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9256fed248..0da6748ceb 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1206,7 +1206,6 @@ Make sure that this change will maintain historical page continuity. 'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)', # Search results -'searchtext' => '$1', # don't translate or duplicate this message to other languages 'searchresults' => 'Search results', 'searchresulttext' => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].', 'searchsubtitle' => "You searched for '''[[:$1]]'''", -- 2.20.1