From e11aebc86bf051c447afcb6171e34fb72e3a3810 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20Stojni=C4=87?= Date: Sat, 2 Aug 2008 14:53:49 +0000 Subject: [PATCH] Seems we cannot relay on __toString() to do its job on all PHP versions, now gets prefixedText() the safe way. Thanks Nikerabbit for pointing it out. --- includes/specials/SpecialSearch.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 4f0b35b373..56d4f75016 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -278,7 +278,7 @@ class SpecialSearch { function setupPage( $term ) { global $wgOut; if( !empty( $term ) ) - $wgOut->setPageTitle( wfMsg( 'searchresults' ) ); + $searchTitle = SpecialPage::getTitleFor( 'Search' ); $subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' ); $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) ); $wgOut->setArticleRelated( false ); @@ -597,10 +597,11 @@ class SpecialSearch { $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' ); $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) ); $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n"; - + $searchTitle = SpecialPage::getTitleFor( 'Search' ); + $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) . Xml::fieldset( wfMsg( 'powersearch-legend' ), - Xml::hidden( 'title', SpecialPage::getTitleFor( 'Search' ) ) . + Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "

" . wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) . "
" . @@ -636,7 +637,8 @@ class SpecialSearch { 'method' => 'get', 'action' => $wgScript )); - $out .= Xml::hidden( 'title', SpecialPage::getTitleFor( 'Search' ) ); + $searchTitle = SpecialPage::getTitleFor( 'Search' ); + $out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() ); $out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . ' '; foreach( SearchEngine::searchableNamespaces() as $ns => $name ) { if( in_array( $ns, $this->namespaces ) ) { -- 2.20.1