* Added flag "top" to list=usercontribs if the user is the last contributor to the...

[lhc/web/wiklou.git] / includes / api / ApiQueryDeletedrevs.php

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index a8c8f65..b63fc00 100644 (file)
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -30,8 +30,8 @@ if (!defined('MEDIAWIKI')) {
 
 /**
  * Query module to enumerate all available pages.
- * 
- * @addtogroup API
+ *
+ * @ingroup API
  */
 class ApiQueryDeletedrevs extends ApiQueryBase {
 
@@ -87,11 +87,16 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                // Check limits
                $userMax = $fld_content ? ApiBase :: LIMIT_SML1 : ApiBase :: LIMIT_BIG1;
                $botMax  = $fld_content ? ApiBase :: LIMIT_SML2 : ApiBase :: LIMIT_BIG2;
+
+               $limit = $params['limit'];
+
                if( $limit == 'max' ) {
                        $limit = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
-                       $this->getResult()->addValue( 'limits', 'limit', $limit );
+                       $this->getResult()->addValue( 'limits', $this->getModuleName(), $limit );
                }
-               $this->validateLimit('limit', $params['limit'], 1, $userMax, $botMax);
+
+               $this->validateLimit('limit', $limit, 1, $userMax, $botMax);
+
                if($fld_token)
                        // Undelete tokens are identical for all pages, so we cache one here
                        $token = $wgUser->editToken();
@@ -106,8 +111,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
                $this->addOption('LIMIT', $params['limit'] + 1);
                $this->addWhereRange('ar_timestamp', $params['dir'], $params['start'], $params['end']);
-               if(isset($params['namespace']))
-                       $this->addWhereFld('ar_namespace', $params['namespace']);
                $res = $this->select(__METHOD__);
                $pages = array();
                $count = 0;
@@ -178,10 +181,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                                ),
                                ApiBase :: PARAM_DFLT => 'older'
                        ),
-                       'namespace' => array(
-                               ApiBase :: PARAM_ISMULTI => true,
-                               ApiBase :: PARAM_TYPE => 'namespace'
-                       ),
                        'limit' => array(
                                ApiBase :: PARAM_DFLT => 10,
                                ApiBase :: PARAM_TYPE => 'limit',
@@ -210,7 +209,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                        'start' => 'The timestamp to start enumerating from',
                        'end' => 'The timestamp to stop enumerating at',
                        'dir' => 'The direction in which to enumerate',
-                       'namespace' => 'The namespaces to search in',
                        'limit' => 'The maximum amount of revisions to list',
                        'prop' => 'Which properties to get'
                );
@@ -222,8 +220,8 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
        protected function getExamples() {
                return array (
-                       'List the first 50 deleted revisions in the Category and Category talk namespaces',
-                       '  api.php?action=query&list=deletedrevs&drdir=newer&drlimit=50&drnamespace=14|15',
+                       'List the first 50 deleted revisions',
+                       '  api.php?action=query&list=deletedrevs&drdir=newer&drlimit=50',
                        'List the last deleted revisions of Main Page and Talk:Main Page, with content:',
                        '  api.php?action=query&list=deletedrevs&titles=Main%20Page|Talk:Main%20Page&drprop=user|comment|content'
                );