http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71834
Revision: 71834
Author: reedy
Date: 2010-08-28 00:52:38 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
Couple more userid properties for Bug 19195
Modified Paths:
--------------
trunk/phase3/includes/api/ApiQueryDeletedrevs.php
trunk/phase3/includes/api/ApiQueryLogEvents.php
Modified: trunk/phase3/includes/api/ApiQueryDeletedrevs.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryDeletedrevs.php 2010-08-28 00:48:57 UTC
(rev 71833)
+++ trunk/phase3/includes/api/ApiQueryDeletedrevs.php 2010-08-28 00:52:38 UTC
(rev 71834)
@@ -52,6 +52,7 @@
$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 @@
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 @@
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 @@
ApiBase::PARAM_TYPE => array(
'revid',
'user',
+ 'userid',
'comment',
'parsedcomment',
'minor',
@@ -311,7 +319,8 @@
'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',
Modified: trunk/phase3/includes/api/ApiQueryLogEvents.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryLogEvents.php 2010-08-28 00:48:57 UTC
(rev 71833)
+++ trunk/phase3/includes/api/ApiQueryLogEvents.php 2010-08-28 00:52:38 UTC
(rev 71834)
@@ -51,6 +51,7 @@
$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 @@
$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 @@
}
}
- 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'] = '';
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
