Merge "Preserve 'srbackend' query parameter"

diff --combined includes/specials/SpecialSearch.php
index 423b875,7eb15b7..1caed0b
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -82,8 -82,7 +82,8 @@@ class SpecialSearch extends SpecialPag
                $out = $this->getOutput();
                $out->allowClickjacking();
                $out->addModuleStyles( array(
 -                      'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui', 'mediawiki.ui.button'
 +                      'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui', 'mediawiki.ui.button',
 +                      'mediawiki.ui.input',
                ) );
  
                // Strip underscores from title parameter; most of the time we'll want
@@@ -347,6 -346,9 +347,9 @@@
                        // Show the create link ahead
                        $this->showCreateLink( $title, $num, $titleMatches, $textMatches );
                        if ( $totalRes > $this->limit || $this->offset ) {
+                               if ( $this->searchEngineType !== null ) {
+                                       $this->setExtraParam( 'srbackend', $this->searchEngineType );
+                               }
                                $prevnext = $this->getLanguage()->viewPrevNext(
                                        $this->getPageTitle(),
                                        $this->offset,
@@@ -407,7 -409,7 +410,7 @@@
         * @param Title $title
         * @param int $num The number of search results found
         * @param null|SearchResultSet $titleMatches Results from title search
 -       * @param null|SearchResultSet $textMatches  Results from text search
 +       * @param null|SearchResultSet $textMatches Results from text search
         */
        protected function showCreateLink( $title, $num, $titleMatches, $textMatches ) {
                // show direct page/create link if applicable
@@@ -424,10 -426,8 +427,10 @@@
                        return;
                }
  
 +              $linkClass = 'mw-search-createlink';
                if ( $title->isKnown() ) {
                        $messageName = 'searchmenu-exists';
 +                      $linkClass = 'mw-search-exists';
                } elseif ( $title->quickUserCan( 'create', $this->getUser() ) ) {
                        $messageName = 'searchmenu-new';
                } else {
@@@ -442,7 -442,7 +445,7 @@@
  
                // Extensions using the hook might still return an empty $messageName
                if ( $messageName ) {
 -                      $this->getOutput()->wrapWikiMsg( "<p class=\"mw-search-createlink\">\n$1</p>", $params );
 +                      $this->getOutput()->wrapWikiMsg( "<p class=\"$linkClass\">\n$1</p>", $params );
                } else {
                        // preserve the paragraph for margins etc...
                        $this->getOutput()->addHtml( '<p></p>' );
@@@ -801,7 -801,7 +804,7 @@@
         * @param SearchResult $result
         * @param string $lastInterwiki
         * @param string $query
 -       * @param array $customCaptions iw prefix -> caption
 +       * @param array $customCaptions Interwiki prefix -> caption
         *
         * @return string
         */
@@@ -1084,7 -1084,7 +1087,7 @@@
                        'id' => $this->profile === 'advanced' ? 'powerSearchText' : 'searchText',
                        'size' => '50',
                        'autofocus',
 -                      'class' => 'mw-ui-input',
 +                      'class' => 'mw-ui-input mw-ui-input-inline',
                ) ) . "\n";
                $out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
                $out .= Xml::submitButton(
@@@ -1093,7 -1093,7 +1096,7 @@@
                ) . "\n";
  
                // Results-info
 -              if ( $totalNum > 0 ) {
 +              if ( $totalNum > 0 && $this->offset < $totalNum ) {
                        $top = $this->msg( 'showingresultsheader' )
                                ->numParams( $this->offset + 1, $this->offset + $resultsShown, $totalNum )
                                ->params( wfEscapeWikiText( $term ) )