Couple more userid properties for Bug 19195

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index b4ec7de..e6213fc 100644 (file)
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -52,6 +52,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                $prop = array_flip( $params['prop'] );
                $fld_revid = isset( $prop['revid'] );
                $fld_user = isset( $prop['user'] );
+               $fld_userid = isset( $prop['userid'] );
                $fld_comment = isset( $prop['comment'] );
                $fld_parsedcomment = isset ( $prop['parsedcomment'] );
                $fld_minor = isset( $prop['minor'] );
@@ -87,6 +88,9 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                if ( $fld_user ) {
                        $this->addFields( 'ar_user_text' );
                }
+               if ( $fld_userid ) {
+                       $this->addFields( 'ar_user' );
+               }
                if ( $fld_comment || $fld_parsedcomment ) {
                        $this->addFields( 'ar_comment' );
                }
@@ -202,6 +206,9 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                        if ( $fld_user ) {
                                $rev['user'] = $row->ar_user_text;
                        }
+                       if ( $fld_userid ) {
+                               $rev['userid'] = $row->ar_user;
+                       }
                        if ( $fld_comment ) {
                                $rev['comment'] = $row->ar_comment;
                        }
@@ -290,6 +297,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                                ApiBase::PARAM_TYPE => array(
                                        'revid',
                                        'user',
+                                       'userid',
                                        'comment',
                                        'parsedcomment',
                                        'minor',
@@ -311,7 +319,8 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                        'prop' => array(
                                'Which properties to get',
                                ' revid          - Adds the revision id of the deleted revision',
-                               ' user           - Adds user who made the revision',
+                               ' user           - Adds the user who made the revision',
+                               ' userid         - Adds the user id whom made the revision',
                                ' comment        - Adds the comment of the revision',
                                ' parsedcomment  - Adds the parsed comment of the revision',
                                ' minor          - Tags if the revision is minor',

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index eb1ec56..c28dd5c 100644 (file)
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -51,6 +51,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $this->fld_type = isset( $prop['type'] );
                $this->fld_action = isset ( $prop['action'] );
                $this->fld_user = isset( $prop['user'] );
+               $this->fld_userid = isset( $prop['userid'] );
                $this->fld_timestamp = isset( $prop['timestamp'] );
                $this->fld_comment = isset( $prop['comment'] );
                $this->fld_parsedcomment = isset ( $prop['parsedcomment'] );
@@ -84,6 +85,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $this->addFieldsIf( 'page_id', $this->fld_ids );
                $this->addFieldsIf( 'log_user', $this->fld_user );
                $this->addFieldsIf( 'user_name', $this->fld_user );
+               $this->addFieldsIf( 'user_id', $this->fld_userid );
                $this->addFieldsIf( 'log_namespace', $this->fld_title || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_title', $this->fld_title || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_comment', $this->fld_comment || $this->fld_parsedcomment );
@@ -259,11 +261,17 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        }
                }
 
-               if ( $this->fld_user ) {
+               if ( $this->fld_user || $this->fld_userid ) {
                        if ( LogEventsList::isDeleted( $row, LogPage::DELETED_USER ) ) {
                                $vals['userhidden'] = '';
                        } else {
-                               $vals['user'] = $row->user_name;
+                               if ( $this->fld_user ) {
+                                       $vals['user'] = $row->user_name;
+                               }
+                               if ( $this->fld_userid ) {
+                                       $vals['userid'] = $row->user_id;
+                               }
+                               
                                if ( !$row->log_user ) {
                                        $vals['anon'] = '';
                                }