Merge "Move pager inside searchresults div"

diff --combined includes/specials/SpecialSearch.php
index 629f88a,d0cb398..f50dd09
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -390,12 -390,13 +390,13 @@@ class SpecialSearch extends SpecialPag
                                $this->showCreateLink( $title, $num, $titleMatches, $textMatches );
                        }
                }
-               $out->addHtml( "</div>" );
  
                if ( $prevnext ) {
                        $out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
                }
  
+               $out->addHtml( "</div>" );
+ 
                Hooks::run( 'SpecialSearchResultsAppend', array( $this, $out ) );
  
        }
@@@ -408,6 -409,8 +409,6 @@@
         * @return bool
         */
        protected function shouldRunSuggestedQuery( SearchResultSet $textMatches ) {
 -              global $wgSearchRunSuggestedQueryPercent;
 -
                if ( !$this->runSuggestion ||
                        !$textMatches->hasSuggestion() ||
                        $textMatches->numRows() > 0 ||
@@@ -419,7 -422,7 +420,7 @@@
                // Generate a random number between 0 and 1. If the
                // number is less than the desired percentages run it.
                $rand = rand( 0, getrandmax() ) / getrandmax();
 -              return $wgSearchRunSuggestedQueryPercent > $rand;
 +              return $this->getConfig()->get( 'SearchRunSuggestedQueryPercent' ) > $rand;
        }
  
        /**