Merge "autocomplete: fix duplicate/missing tracking events"

diff --combined includes/specials/SpecialSearch.php
index 45d2415,c1b67bd..aed2fa6
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -720,7 -720,7 +720,7 @@@ class SpecialSearch extends SpecialPag
  
                $out .= "<ul class='mw-search-results'>\n";
                while ( $result ) {
-                       $out .= $this->showHit( $result, $terms, ++$pos );
+                       $out .= $this->showHit( $result, $terms, $pos++ );
                        $result = $matches->next();
                }
                $out .= "</ul>\n";
@@@ -1166,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 ) ) {
@@@ -1266,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;