Start migrating wfCheckLimits to WebRequest::getLimitOffset()

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 606b98f..a544971 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -452,20 +452,8 @@ function wfClientAcceptsGzip() {
 
 # Yay, more global functions!
 function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
-       global $wgUser, $wgRequest;
-
-       $limit = $wgRequest->getInt( 'limit', 0 );
-       if( $limit < 0 ) $limit = 0;
-       if( ( $limit == 0 ) && ( $optionname != '' ) ) {
-               $limit = (int)$wgUser->getOption( $optionname );
-       }
-       if( $limit <= 0 ) $limit = $deflimit;
-       if( $limit > 5000 ) $limit = 5000; # We have *some* limits...
-
-       $offset = $wgRequest->getInt( 'offset', 0 );
-       if( $offset < 0 ) $offset = 0;
-
-       return array( $limit, $offset );
+       global $wgRequest;
+       return $wgRequest->getLimitOffset( $deflimit, $optionname );
 }
 
 # Escapes the given text so that it may be output using addWikiText()

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index a069ee7..841ce29 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -145,6 +145,22 @@ class WebRequest {
                return htmlspecialchars( $this->appendQuery( $query ) );
        }
        
+       function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) {
+               global $wgUser;
+       
+               $limit = $this->getInt( 'limit', 0 );
+               if( $limit < 0 ) $limit = 0;
+               if( ( $limit == 0 ) && ( $optionname != '' ) ) {
+                       $limit = (int)$wgUser->getOption( $optionname );
+               }
+               if( $limit <= 0 ) $limit = $deflimit;
+               if( $limit > 5000 ) $limit = 5000; # We have *some* limits...
+       
+               $offset = $this->getInt( 'offset', 0 );
+               if( $offset < 0 ) $offset = 0;
+       
+               return array( $limit, $offset );
+       }
 }
 
 ?>