Merge "Don't use rclimit preference on Special:Search"

diff --combined includes/specials/SpecialSearch.php
index f119288,530fbc8..448dd2d
--- 1/includes/specials/SpecialSearch.php
--- 2/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@@ -114,7 -114,7 +114,7 @@@ class SpecialSearch extends SpecialPag
         */
        public function load() {
                $request = $this->getRequest();
-               list( $this->limit, $this->offset ) = $request->getLimitOffset( 20 );
+               list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, '' );
                $this->mPrefix = $request->getVal( 'prefix', '' );
  
                $user = $this->getUser();
@@@ -207,7 -207,8 +207,7 @@@
  
                $profile = new ProfileSection( __METHOD__ );
                $search = $this->getSearchEngine();
 -              // Request an extra result to determine whether a "next page" link is useful
 -              $search->setLimitOffset( $this->limit + 1, $this->offset );
 +              $search->setLimitOffset( $this->limit, $this->offset );
                $search->setNamespaces( $this->namespaces );
                $this->saveNamespaces();
                $search->prefix = $this->mPrefix;
@@@ -351,7 -352,7 +351,7 @@@
                                        $this->offset,
                                        $this->limit,
                                        $this->powerSearchOptions() + array( 'search' => $term ),
 -                                      max( $titleMatchesNum, $textMatchesNum ) <= $this->limit
 +                                      $this->limit + $this->offset >= $totalRes
                                );
                        }
                        wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
@@@ -511,11 -512,7 +511,11 @@@
  
                if ( $user->isLoggedIn() &&
                        !is_null( $request->getVal( 'nsRemember' ) ) &&
 -                      $user->matchEditToken( $request->getVal( 'nsToken' ) )
 +                      $user->matchEditToken(
 +                              $request->getVal( 'nsToken' ),
 +                              'searchnamespace',
 +                              $request
 +                      )
                ) {
                        // Reset namespace preferences: namespaces are not searched
                        // when they're not mentioned in the URL parameters.
@@@ -550,9 -547,11 +550,9 @@@
  
                $out = "<ul class='mw-search-results'>\n";
                $result = $matches->next();
 -              $count = 0;
 -              while ( $result && $count < $this->limit ) {
 +              while ( $result ) {
                        $out .= $this->showHit( $result, $terms );
                        $result = $matches->next();
 -                      $count++;
                }
                $out .= "</ul>\n";
  
@@@ -937,13 -936,7 +937,13 @@@
                $remember = '';
                $user = $this->getUser();
                if ( $user->isLoggedIn() ) {
 -                      $remember .= Html::hidden( 'nsToken', $user->getEditToken() ) .
 +                      $remember .= Html::hidden(
 +                              'nsToken',
 +                              $user->getEditToken(
 +                                      'searchnamespace',
 +                                      $this->getRequest()
 +                              )
 +                      ) .
                        Xml::checkLabel(
                                wfMessage( 'powersearch-remember' )->text(),
                                'nsRemember',