X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecials%2FSpecialSearch.php;h=e1fbe6a4882ef8cefd71f7901d2ffdf81b717c1e;hp=ed83aafd53ca49c6046c80a6f25108d6be48c0b2;hb=dfec83932fd38a9086eb5a2e212889ad00f35b0e;hpb=15098a94bae982f1f77f12ca4f53fc3743c7db37 diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index ed83aafd53..e1fbe6a488 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -314,14 +314,14 @@ class SpecialSearch extends SpecialPage { return; } - $search = $this->getSearchEngine(); - $search->setFeatureData( 'rewrite', $this->runSuggestion ); - $search->setLimitOffset( $this->limit, $this->offset ); - $search->setNamespaces( $this->namespaces ); - $search->setSort( $this->sort ); - $search->prefix = $this->mPrefix; - - Hooks::run( 'SpecialSearchSetupEngine', [ $this, $this->profile, $search ] ); + $engine = $this->getSearchEngine(); + $engine->setFeatureData( 'rewrite', $this->runSuggestion ); + $engine->setLimitOffset( $this->limit, $this->offset ); + $engine->setNamespaces( $this->namespaces ); + $engine->setSort( $this->sort ); + $engine->prefix = $this->mPrefix; + + Hooks::run( 'SpecialSearchSetupEngine', [ $this, $this->profile, $engine ] ); if ( !Hooks::run( 'SpecialSearchResultsPrepend', [ $this, $out, $term ] ) ) { # Hook requested termination return; @@ -329,17 +329,17 @@ class SpecialSearch extends SpecialPage { $title = Title::newFromText( $term ); $showSuggestion = $title === null || !$title->isKnown(); - $search->setShowSuggestion( $showSuggestion ); + $engine->setShowSuggestion( $showSuggestion ); - $rewritten = $search->replacePrefixes( $term ); + $rewritten = $engine->replacePrefixes( $term ); if ( $rewritten !== $term ) { wfDeprecated( 'SearchEngine::replacePrefixes() (overridden by ' . - get_class( $search ) . ')', '1.32' ); + get_class( $engine ) . ')', '1.32' ); } // fetch search results - $titleMatches = $search->searchTitle( $rewritten ); - $textMatches = $search->searchText( $rewritten ); + $titleMatches = $engine->searchTitle( $rewritten ); + $textMatches = $engine->searchText( $rewritten ); $textStatus = null; if ( $textMatches instanceof Status ) { @@ -357,7 +357,7 @@ class SpecialSearch extends SpecialPage { $textMatchesNum = $textMatches->numRows(); $numTextMatches = $textMatches->getTotalHits(); if ( $textMatchesNum > 0 ) { - $search->augmentSearchResults( $textMatches ); + $engine->augmentSearchResults( $textMatches ); } } $num = $titleMatchesNum + $textMatchesNum; @@ -418,14 +418,14 @@ class SpecialSearch extends SpecialPage { $mainResultWidget = new FullSearchResultWidget( $this, $linkRenderer ); // Default (null) on. Can be explicitly disabled. - if ( $search->getFeatureData( 'enable-new-crossproject-page' ) !== false ) { + if ( $engine->getFeatureData( 'enable-new-crossproject-page' ) !== false ) { $sidebarResultWidget = new InterwikiSearchResultWidget( $this, $linkRenderer ); $sidebarResultsWidget = new InterwikiSearchResultSetWidget( $this, $sidebarResultWidget, $linkRenderer, MediaWikiServices::getInstance()->getInterwikiLookup(), - $search->getFeatureData( 'show-multimedia-search-results' ) + $engine->getFeatureData( 'show-multimedia-search-results' ) ); } else { $sidebarResultWidget = new SimpleSearchResultWidget( $this, $linkRenderer ); @@ -463,13 +463,13 @@ class SpecialSearch extends SpecialPage { $offset = $this->offset; } - $prevnext = $this->buildPrevNextNavigation( + $prevNext = $this->buildPrevNextNavigation( $offset, $this->limit, $this->powerSearchOptions() + [ 'search' => $term ], $this->limit + $this->offset >= $totalRes ); - $out->addHTML( "

{$prevnext}

\n" ); + $out->addHTML( "

{$prevNext}

\n" ); } // Close