From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/specials/SpecialSearch.php | 412 ++++++++++++++++++++++-------------- 1 file changed, 248 insertions(+), 164 deletions(-) (limited to 'includes/specials/SpecialSearch.php') diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index fd6e858e..ba9d378a 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -23,36 +23,67 @@ * @ingroup SpecialPage */ -/** - * Entry point - * - * @param $par String: (default '') - */ -function wfSpecialSearch( $par = '' ) { - global $wgRequest, $wgUser, $wgOut; - $wgOut->allowClickjacking(); - - // Strip underscores from title parameter; most of the time we'll want - // text form here. But don't strip underscores from actual text params! - $titleParam = str_replace( '_', ' ', $par ); - // Fetch the search term - $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) ); - $searchPage = new SpecialSearch( $wgRequest, $wgUser ); - if( $wgRequest->getVal( 'fulltext' ) - || !is_null( $wgRequest->getVal( 'offset' )) - || !is_null( $wgRequest->getVal( 'searchx' )) ) - { - $searchPage->showResults( $search ); - } else { - $searchPage->goResult( $search ); - } -} - /** * implements Special:Search - Run text & title search and display the output * @ingroup SpecialPage */ -class SpecialSearch { +class SpecialSearch extends SpecialPage { + /** + * Current search profile. Search profile is just a name that identifies + * the active search tab on the search page (content, help, discussions...) + * For users tt replaces the set of enabled namespaces from the query + * string when applicable. Extensions can add new profiles with hooks + * with custom search options just for that profile. + * null|string + */ + protected $profile; + + /// Search engine + protected $searchEngine; + + /// For links + protected $extraParams = array(); + + /// No idea, apparently used by some other classes + protected $mPrefix; + + const NAMESPACES_CURRENT = 'sense'; + + public function __construct() { + parent::__construct( 'Search' ); + } + + /** + * Entry point + * + * @param $par String or null + */ + public function execute( $par ) { + global $wgRequest, $wgUser, $wgOut; + + $this->setHeaders(); + $this->outputHeader(); + $wgOut->allowClickjacking(); + $wgOut->addModuleStyles( 'mediawiki.special' ); + + // Strip underscores from title parameter; most of the time we'll want + // text form here. But don't strip underscores from actual text params! + $titleParam = str_replace( '_', ' ', $par ); + + // Fetch the search term + $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) ); + + $this->load( $wgRequest, $wgUser ); + + if ( $wgRequest->getVal( 'fulltext' ) + || !is_null( $wgRequest->getVal( 'offset' ) ) + || !is_null( $wgRequest->getVal( 'searchx' ) ) ) + { + $this->showResults( $search ); + } else { + $this->goResult( $search ); + } + } /** * Set up basic search parameters from the request and user settings. @@ -61,18 +92,44 @@ class SpecialSearch { * @param $request WebRequest * @param $user User */ - public function __construct( &$request, &$user ) { + public function load( &$request, &$user ) { list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' ); - $this->mPrefix = $request->getVal('prefix', ''); - # Extract requested namespaces - $this->namespaces = $this->powerSearch( $request ); - if( empty( $this->namespaces ) ) { - $this->namespaces = SearchEngine::userNamespaces( $user ); + $this->mPrefix = $request->getVal( 'prefix', '' ); + + + # Extract manually requested namespaces + $nslist = $this->powerSearch( $request ); + $this->profile = $profile = $request->getVal( 'profile', null ); + $profiles = $this->getSearchProfiles(); + if ( $profile === null) { + // BC with old request format + $this->profile = 'advanced'; + if ( count( $nslist ) ) { + foreach( $profiles as $key => $data ) { + if ( $nslist === $data['namespaces'] && $key !== 'advanced') { + $this->profile = $key; + } + } + $this->namespaces = $nslist; + } else { + $this->namespaces = SearchEngine::userNamespaces( $user ); + } + } elseif ( $profile === 'advanced' ) { + $this->namespaces = $nslist; + } else { + if ( isset( $profiles[$profile]['namespaces'] ) ) { + $this->namespaces = $profiles[$profile]['namespaces']; + } else { + // Unknown profile requested + $this->profile = 'default'; + $this->namespaces = $profiles['default']['namespaces']; + } } - $this->searchRedirects = $request->getCheck( 'redirs' ); - $this->searchAdvanced = $request->getVal( 'advanced' ); - $this->active = 'advanced'; - $this->sk = $user->getSkin(); + + // Redirects defaults to true, but we don't know whether it was ticked of or just missing + $default = $request->getBool( 'profile' ) ? 0 : 1; + $this->searchRedirects = $request->getBool( 'redirs', $default ) ? 1 : 0; + $this->sk = $this->getSkin(); $this->didYouMeanHtml = ''; # html of did you mean... link $this->fulltext = $request->getVal('fulltext'); } @@ -93,12 +150,12 @@ class SpecialSearch { } # If there's an exact or very near match, jump right there. $t = SearchEngine::getNearMatch( $term ); - + if ( !wfRunHooks( 'SpecialSearchGo', array( &$t, &$term ) ) ) { # Hook requested termination return; } - + if( !is_null( $t ) ) { $wgOut->redirect( $t->getFullURL() ); return; @@ -123,19 +180,21 @@ class SpecialSearch { * @param $term String */ public function showResults( $term ) { - global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang, $wgScript; + global $wgOut, $wgDisableTextSearch, $wgContLang, $wgScript; wfProfileIn( __METHOD__ ); - $sk = $wgUser->getSkin(); + $sk = $this->getSkin(); - $this->searchEngine = SearchEngine::create(); - $search =& $this->searchEngine; + $search = $this->getSearchEngine(); $search->setLimitOffset( $this->limit, $this->offset ); $search->setNamespaces( $this->namespaces ); - $search->showRedirects = $this->searchRedirects; + $search->showRedirects = $this->searchRedirects; // BC + $search->setFeatureData( 'list-redirects', $this->searchRedirects ); $search->prefix = $this->mPrefix; $term = $search->transformSearchTerm($term); + wfRunHooks( 'SpecialSearchSetupEngine', array( $this, $this->profile, $search ) ); + $this->setupPage( $term ); if( $wgDisableTextSearch ) { @@ -146,14 +205,13 @@ class SpecialSearch { wfProfileOut( __METHOD__ ); return; } - global $wgInputEncoding; $wgOut->addHTML( Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'search-external' ) ) . Xml::element( 'p', array( 'class' => 'mw-searchdisabled' ), wfMsg( 'searchdisabled' ) ) . wfMsg( 'googlesearch', htmlspecialchars( $term ), - htmlspecialchars( $wgInputEncoding ), + htmlspecialchars( 'UTF-8' ), htmlspecialchars( wfMsg( 'searchbutton' ) ) ) . Xml::closeElement( 'fieldset' ) @@ -205,7 +263,7 @@ class SpecialSearch { Xml::openElement( 'form', array( - 'id' => ( $this->searchAdvanced ? 'powersearch' : 'search' ), + 'id' => ( $this->profile === 'advanced' ? 'powersearch' : 'search' ), 'method' => 'get', 'action' => $wgScript ) @@ -214,7 +272,7 @@ class SpecialSearch { $wgOut->addHtml( Xml::openElement( 'table', array( 'id'=>'mw-search-top-table', 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) . Xml::openElement( 'tr' ) . - Xml::openElement( 'td' ) . "\n" . + Xml::openElement( 'td' ) . "\n" . $this->shortDialog( $term ) . Xml::closeElement('td') . Xml::closeElement('tr') . @@ -223,17 +281,15 @@ class SpecialSearch { // Sometimes the search engine knows there are too many hits if( $titleMatches instanceof SearchResultTooMany ) { - $wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" ); + $wgOut->wrapWikiMsg( "==$1==\n", 'toomanymatches' ); wfProfileOut( __METHOD__ ); return; } $filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':'; if( trim( $term ) === '' || $filePrefix === trim( $term ) ) { - $wgOut->addHTML( $this->formHeader($term, 0, 0)); - if( $this->searchAdvanced ) { - $wgOut->addHTML( $this->powerSearchBox( $term ) ); - } + $wgOut->addHTML( $this->formHeader( $term, 0, 0 ) ); + $wgOut->addHtml( $this->getProfileForm( $this->profile, $term ) ); $wgOut->addHTML( '' ); // Empty query -- straight view of search form wfProfileOut( __METHOD__ ); @@ -245,7 +301,7 @@ class SpecialSearch { $textMatchesNum = $textMatches ? $textMatches->numRows() : 0; // Total initial query matches (possible false positives) $num = $titleMatchesNum + $textMatchesNum; - + // Get total actual results (after second filtering, if any) $numTitleMatches = $titleMatches && !is_null( $titleMatches->getTotalHits() ) ? $titleMatches->getTotalHits() : $titleMatchesNum; @@ -258,13 +314,12 @@ class SpecialSearch { $totalRes += $titleMatches->getTotalHits(); if($textMatches && !is_null( $textMatches->getTotalHits() )) $totalRes += $textMatches->getTotalHits(); - + // show number of results and current offset - $wgOut->addHTML( $this->formHeader($term, $num, $totalRes)); - if( $this->searchAdvanced ) { - $wgOut->addHTML( $this->powerSearchBox( $term ) ); - } - + $wgOut->addHTML( $this->formHeader( $term, $num, $totalRes ) ); + $wgOut->addHtml( $this->getProfileForm( $this->profile, $term ) ); + + $wgOut->addHtml( Xml::closeElement( 'form' ) ); $wgOut->addHtml( "
" ); @@ -281,8 +336,9 @@ class SpecialSearch { wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) ); } else { wfRunHooks( 'SpecialSearchNoResults', array( $term ) ); - } + } + $wgOut->parserOptions()->setEditSection( false ); if( $titleMatches ) { if( $numTitleMatches > 0 ) { $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' ); @@ -321,23 +377,33 @@ class SpecialSearch { } wfProfileOut( __METHOD__ ); } - + protected function showCreateLink( $t ) { global $wgOut; - + // show direct page/create link if applicable - $messageName = null; - if( !is_null($t) ) { - if( $t->isKnown() ) { - $messageName = 'searchmenu-exists'; - } elseif( $t->userCan( 'create' ) ) { - $messageName = 'searchmenu-new'; - } else { - $messageName = 'searchmenu-new-nocreate'; - } - } + + // Check DBkey !== '' in case of fragment link only. + if( is_null( $t ) || $t->getDBkey() === '' ) { + // invalid title + // preserve the paragraph for margins etc... + $this->getOutput()->addHtml( '

' ); + return; + } + $messageName = ''; + if( $t->isKnown() ) { + $messageName = 'searchmenu-exists'; + } elseif( $t->userCan( 'create' ) ) { + $messageName = 'searchmenu-new'; + } else { + $messageName = 'searchmenu-new-nocreate'; + } + $params = array( $messageName, wfEscapeWikiText( $t->getPrefixedText() ) ); + wfRunHooks( 'SpecialSearchCreateLink', array( $t, &$params ) ); + + // Extensions using the hook might still return an empty $messageName if( $messageName ) { - $wgOut->wrapWikiMsg( "

\n$1

", array( $messageName, wfEscapeWikiText( $t->getPrefixedText() ) ) ); + $this->getOutput()->wrapWikiMsg( "

\n$1

", $params ); } else { // preserve the paragraph for margins etc... $wgOut->addHtml( '

' ); @@ -349,28 +415,14 @@ class SpecialSearch { */ protected function setupPage( $term ) { global $wgOut; - // Figure out the active search profile header - if( $this->searchAdvanced ) { - $this->active = 'advanced'; - } else { - $profiles = $this->getSearchProfiles(); - - foreach( $profiles as $key => $data ) { - if ( $this->namespaces == $data['namespaces'] && $key != 'advanced') - $this->active = $key; - } - - } + # Should advanced UI be used? - $this->searchAdvanced = ($this->active === 'advanced'); - if( !empty( $term ) ) { + $this->searchAdvanced = ($this->profile === 'advanced'); + if( strval( $term ) !== '' ) { $wgOut->setPageTitle( wfMsg( 'searchresults') ); $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) ); } - $wgOut->setArticleRelated( false ); - $wgOut->setRobotPolicy( 'noindex,nofollow' ); // add javascript specific to special:search - $wgOut->addModules( 'mediawiki.legacy.search' ); $wgOut->addModules( 'mediawiki.special.search' ); } @@ -388,6 +440,7 @@ class SpecialSearch { $arr[] = $ns; } } + return $arr; } @@ -398,14 +451,15 @@ class SpecialSearch { */ protected function powerSearchOptions() { $opt = array(); - foreach( $this->namespaces as $n ) { - $opt['ns' . $n] = 1; - } $opt['redirs'] = $this->searchRedirects ? 1 : 0; - if( $this->searchAdvanced ) { - $opt['advanced'] = $this->searchAdvanced; + if( $this->profile !== 'advanced' ) { + $opt['profile'] = $this->profile; + } else { + foreach( $this->namespaces as $n ) { + $opt['ns' . $n] = 1; + } } - return $opt; + return $opt + $this->extraParams; } /** @@ -443,7 +497,7 @@ class SpecialSearch { * @param $terms Array: terms to highlight */ protected function showHit( $result, $terms ) { - global $wgLang, $wgUser; + global $wgLang; wfProfileIn( __METHOD__ ); if( $result->isBrokenTitle() ) { @@ -451,16 +505,16 @@ class SpecialSearch { return "\n"; } - $sk = $wgUser->getSkin(); + $sk = $this->getSkin(); $t = $result->getTitle(); $titleSnippet = $result->getTitleSnippet($terms); if( $titleSnippet == '' ) $titleSnippet = null; - + $link_t = clone $t; - + wfRunHooks( 'ShowSearchHitTitle', array( &$link_t, &$titleSnippet, $result, $terms, $this ) ); @@ -509,7 +563,6 @@ class SpecialSearch { $section = ''; - if( !is_null($sectionTitle) ) { if( $sectionText == '' ) $sectionText = null; @@ -544,7 +597,7 @@ class SpecialSearch { $size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ), - $this->sk->formatSize( $byteSize ), + $wgLang->formatSize( $byteSize ), $wgLang->formatNum( $wordCount ) ); @@ -706,13 +759,13 @@ class SpecialSearch { $out = ""; // display project name if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()) { - if( key_exists($t->getInterwiki(),$customCaptions) ) + if( array_key_exists($t->getInterwiki(),$customCaptions) ) { // captions from 'search-interwiki-custom' $caption = $customCaptions[$t->getInterwiki()]; - else{ + } else { // default is to show the hostname of the other wiki which might suck // if there are many wikis on one hostname - $parsed = parse_url($t->getFullURL()); + $parsed = wfParseUrl( $t->getFullURL() ); $caption = wfMsg('search-interwiki-default', $parsed['host']); } // "more results" link (special page stuff could be localized, but we might not know target lang) @@ -735,14 +788,28 @@ class SpecialSearch { return $out; } + protected function getProfileForm( $profile, $term ) { + // Hidden stuff + $opts = array(); + $opts['redirs'] = $this->searchRedirects; + $opts['profile'] = $this->profile; + + if ( $profile === 'advanced' ) { + return $this->powerSearchBox( $term, $opts ); + } else { + $form = ''; + wfRunHooks( 'SpecialSearchProfileForm', array( $this, &$form, $profile, $term, $opts ) ); + return $form; + } + } /** - * Generates the power search box at bottom of [[Special:Search]] + * Generates the power search box at [[Special:Search]] * * @param $term String: search term * @return String: HTML form */ - protected function powerSearchBox( $term ) { + protected function powerSearchBox( $term, $opts ) { // Groups namespaces into rows according to subject $rows = array(); foreach( SearchEngine::searchableNamespaces() as $namespace => $name ) { @@ -768,7 +835,7 @@ class SpecialSearch { } $rows = array_values( $rows ); $numRows = count( $rows ); - + // Lays out namespaces in multiple floating two-column tables so they'll // be arranged nicely while still accommodating different screen widths $namespaceTables = ''; @@ -782,15 +849,21 @@ class SpecialSearch { } $namespaceTables .= Xml::closeElement( 'table' ); } + + $showSections = array( 'namespaceTables' => $namespaceTables ); + // Show redirects check only if backend supports it - $redirects = ''; - if( $this->searchEngine->acceptListRedirects() ) { - $redirects = - Xml::check( - 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) - ) . - ' ' . - Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' ); + if( $this->getSearchEngine()->supports( 'list-redirects' ) ) { + $showSections['redirects'] = + Xml::checkLabel( wfMsg( 'powersearch-redir' ), 'redirs', 'redirs', $this->searchRedirects ); + } + + wfRunHooks( 'SpecialSearchPowerBox', array( &$showSections, $term, $opts ) ); + + $hidden = ''; + unset( $opts['redirs'] ); + foreach( $opts as $key => $value ) { + $hidden .= Html::hidden( $key, $value ); } // Return final output return @@ -809,7 +882,6 @@ class SpecialSearch { array( 'type'=>'button', 'id' => 'mw-search-toggleall', - 'onclick' => 'mwToggleSearchCheckboxes("all");', 'value' => wfMsg( 'powersearch-toggleall' ) ) ) . @@ -818,25 +890,20 @@ class SpecialSearch { array( 'type'=>'button', 'id' => 'mw-search-togglenone', - 'onclick' => 'mwToggleSearchCheckboxes("none");', 'value' => wfMsg( 'powersearch-togglenone' ) ) ) ) . Xml::element( 'div', array( 'class' => 'divider' ), '', false ) . - $namespaceTables . - Xml::element( 'div', array( 'class' => 'divider' ), '', false ) . - $redirects . - Html::hidden( 'title', SpecialPage::getTitleFor( 'Search' )->getPrefixedText() ) . - Html::hidden( 'advanced', $this->searchAdvanced ) . - Html::hidden( 'fulltext', 'Advanced search' ) . + implode( Xml::element( 'div', array( 'class' => 'divider' ), '', false ), $showSections ) . + $hidden . Xml::closeElement( 'fieldset' ); } - + protected function getSearchProfiles() { // Builds list of Search Types (profiles) $nsAllSet = array_keys( SearchEngine::searchableNamespaces() ); - + $profiles = array( 'default' => array( 'message' => 'searchprofile-articles', @@ -867,25 +934,25 @@ class SpecialSearch { 'advanced' => array( 'message' => 'searchprofile-advanced', 'tooltip' => 'searchprofile-advanced-tooltip', - 'namespaces' => $this->namespaces, - 'parameters' => array( 'advanced' => 1 ), + 'namespaces' => self::NAMESPACES_CURRENT, ) ); - + wfRunHooks( 'SpecialSearchProfiles', array( &$profiles ) ); foreach( $profiles as &$data ) { - sort($data['namespaces']); + if ( !is_array( $data['namespaces'] ) ) continue; + sort( $data['namespaces'] ); } - + return $profiles; } protected function formHeader( $term, $resultsShown, $totalNum ) { global $wgLang; - + $out = Xml::openElement('div', array( 'class' => 'mw-search-formheader' ) ); - + $bareterm = $term; if( $this->startsWithImage( $term ) ) { // Deletes prefixes @@ -893,24 +960,29 @@ class SpecialSearch { } $profiles = $this->getSearchProfiles(); - + // Outputs XML for Search Types $out .= Xml::openElement( 'div', array( 'class' => 'search-types' ) ); $out .= Xml::openElement( 'ul' ); foreach ( $profiles as $id => $profile ) { + if ( !isset( $profile['parameters'] ) ) { + $profile['parameters'] = array(); + } + $profile['parameters']['profile'] = $id; + $tooltipParam = isset( $profile['namespace-messages'] ) ? $wgLang->commaList( $profile['namespace-messages'] ) : null; $out .= Xml::tags( 'li', array( - 'class' => $this->active == $id ? 'current' : 'normal' + 'class' => $this->profile === $id ? 'current' : 'normal' ), $this->makeSearchLink( $bareterm, - $profile['namespaces'], + array(), wfMsg( $profile['message'] ), wfMsg( $profile['tooltip'], $tooltipParam ), - isset( $profile['parameters'] ) ? $profile['parameters'] : array() + $profile['parameters'] ) ); } @@ -930,60 +1002,54 @@ class SpecialSearch { } elseif ( $resultsShown >= $this->limit ) { $top = wfShowingResults( $this->offset, $this->limit ); } else { - $top = wfShowingResultsNum( $this->offset, $this->limit, $resultsShown ); + $top = wfMsgExt( 'showingresultsnum', array( 'parseinline' ), + $wgLang->formatNum( $this->limit ), + $wgLang->formatNum( $this->offset + 1 ), + $wgLang->formatNum( $resultsShown ) + ); } $out .= Xml::tags( 'div', array( 'class' => 'results-info' ), Xml::tags( 'ul', null, Xml::tags( 'li', null, $top ) ) ); } - + $out .= Xml::element( 'div', array( 'style' => 'clear:both' ), '', false ); $out .= Xml::closeElement('div'); - - // Adds hidden namespace fields - if ( !$this->searchAdvanced ) { - foreach( $this->namespaces as $ns ) { - $out .= Html::hidden( "ns{$ns}", '1' ); - } - } - + return $out; } protected function shortDialog( $term ) { - $searchTitle = SpecialPage::getTitleFor( 'Search' ); - $out = Html::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n"; - // Keep redirect setting - $out .= Html::hidden( "redirs", (int)$this->searchRedirects ) . "\n"; + $out = Html::hidden( 'title', $this->getTitle()->getPrefixedText() ); + $out .= Html::hidden( 'profile', $this->profile ) . "\n"; // Term box $out .= Html::input( 'search', $term, 'search', array( - 'id' => $this->searchAdvanced ? 'powerSearchText' : 'searchText', + 'id' => $this->profile === 'advanced' ? 'powerSearchText' : 'searchText', 'size' => '50', 'autofocus' ) ) . "\n"; $out .= Html::hidden( 'fulltext', 'Search' ) . "\n"; $out .= Xml::submitButton( wfMsg( 'searchbutton' ) ) . "\n"; - return $out . $this->didYouMeanHtml; + return $out . $this->didYouMeanHtml; } /** * Make a search link with some target namespaces * * @param $term String - * @param $namespaces Array + * @param $namespaces Array ignored * @param $label String: link's text * @param $tooltip String: link's tooltip * @param $params Array: query string parameters * @return String: HTML fragment */ - protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params=array() ) { + protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params = array() ) { $opt = $params; foreach( $namespaces as $n ) { $opt['ns' . $n] = 1; } - $opt['redirs'] = $this->searchRedirects ? 1 : 0; + $opt['redirs'] = $this->searchRedirects; - $st = SpecialPage::getTitleFor( 'Search' ); $stParams = array_merge( array( 'search' => $term, @@ -995,10 +1061,8 @@ class SpecialSearch { return Xml::element( 'a', array( - 'href' => $st->getLocalURL( $stParams ), - 'title' => $tooltip, - 'onmousedown' => 'mwSearchHeaderClick(this);', - 'onkeydown' => 'mwSearchHeaderClick(this);'), + 'href' => $this->getTitle()->getLocalURL( $stParams ), + 'title' => $tooltip), $label ); } @@ -1018,7 +1082,7 @@ class SpecialSearch { } return false; } - + /** * Check if query starts with all: prefix * @@ -1028,12 +1092,32 @@ class SpecialSearch { protected function startsWithAll( $term ) { $allkeyword = wfMsgForContent('searchall'); - + $p = explode( ':', $term ); if( count( $p ) > 1 ) { return $p[0] == $allkeyword; } return false; } -} + /** + * @since 1.18 + */ + public function getSearchEngine() { + if ( $this->searchEngine === null ) { + $this->searchEngine = SearchEngine::create(); + } + return $this->searchEngine; + } + + /** + * Users of hook SpecialSearchSetupEngine can use this to + * add more params to links to not lose selection when + * user navigates search results. + * @since 1.18 + */ + public function setExtraParam( $key, $value ) { + $this->extraParams[$key] = $value; + } + +} -- cgit v1.2.2