Merge "search: did you mean should always go to SERP"

diff --combined includes/specials/SpecialSearch.php
index 36ea983,a779b66..45d2415
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -485,7 -485,9 +485,9 @@@ class SpecialSearch extends SpecialPag
        protected function getDidYouMeanHtml( SearchResultSet $textMatches ) {
                # mirror Go/Search behavior of original request ..
                $params = [ 'search' => $textMatches->getSuggestionQuery() ];
-               if ( $this->fulltext != null ) {
+               if ( $this->fulltext === null ) {
+                       $params['fulltext'] = 'Search';
+               } else {
                        $params['fulltext'] = $this->fulltext;
                }
                $stParams = array_merge( $params, $this->powerSearchOptions() );
@@@ -519,7 -521,9 +521,9 @@@
                // Search instead for '$orig'
  
                $params = [ 'search' => $textMatches->getQueryAfterRewrite() ];
-               if ( $this->fulltext != null ) {
+               if ( $this->fulltext === null ) {
+                       $params['fulltext'] = 'Search';
+               } else {
                        $params['fulltext'] = $this->fulltext;
                }
                $stParams = array_merge( $params, $this->powerSearchOptions() );
@@@ -1162,8 -1166,7 +1166,8 @@@
         * @return string
         */
        protected function searchProfileTabs( $term ) {
 -              $out = Xml::openElement( 'div', [ 'class' => 'mw-search-profile-tabs' ] );
 +              $out = Html::element( 'div', [ 'class' => 'visualClear' ] ) .
 +                      Xml::openElement( 'div', [ 'class' => 'mw-search-profile-tabs' ] );
  
                $bareterm = $term;
                if ( $this->startsWithImage( $term ) ) {
@@@ -1262,7 -1265,8 +1266,7 @@@
                                ->numParams( $this->offset + 1, $this->offset + $resultsShown, $totalNum )
                                ->numParams( $resultsShown )
                                ->parse();
 -                      $out .= Xml::tags( 'div', [ 'class' => 'results-info' ], $top ) .
 -                              Xml::element( 'div', [ 'style' => 'clear:both' ], '', false );
 +                      $out .= Xml::tags( 'div', [ 'class' => 'results-info' ], $top );
                }
  
                return $out;