http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71838
Revision: 71838
Author: reedy
Date: 2010-08-28 01:18:18 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
Describe user property in ApiQueryAllimages
Add userid to ApiQueryProtectedTitles
bug 19195
Modified Paths:
--------------
trunk/phase3/includes/api/ApiQueryAllimages.php
trunk/phase3/includes/api/ApiQueryProtectedTitles.php
Modified: trunk/phase3/includes/api/ApiQueryAllimages.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryAllimages.php 2010-08-28 01:09:21 UTC
(rev 71837)
+++ trunk/phase3/includes/api/ApiQueryAllimages.php 2010-08-28 01:18:18 UTC
(rev 71838)
@@ -200,6 +200,7 @@
'Which properties to get',
' timestamp - Adds the timestamp when the
image was upload',
' user - Adds the username of the last
uploader',
+ ' userid - Adds the user id of the last
uploader',
' comment - Adds the comment of the last
upload',
' url - Adds the URL of the image and
its description page',
' size - Adds the size of the image in
bytes and its height and width',
Modified: trunk/phase3/includes/api/ApiQueryProtectedTitles.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryProtectedTitles.php 2010-08-28
01:09:21 UTC (rev 71837)
+++ trunk/phase3/includes/api/ApiQueryProtectedTitles.php 2010-08-28
01:18:18 UTC (rev 71838)
@@ -55,7 +55,7 @@
$this->addFields( array( 'pt_namespace', 'pt_title',
'pt_timestamp' ) );
$prop = array_flip( $params['prop'] );
- $this->addFieldsIf( 'pt_user', isset( $prop['user'] ) );
+ $this->addFieldsIf( 'pt_user', isset( $prop['user'] ) || isset(
$prop['userid'] ) );
$this->addFieldsIf( 'pt_reason', isset( $prop['comment'] ) ||
isset( $prop['parsedcomment'] ) );
$this->addFieldsIf( 'pt_expiry', isset( $prop['expiry'] ) );
$this->addFieldsIf( 'pt_create_perm', isset( $prop['level'] ) );
@@ -96,6 +96,10 @@
$vals['user'] = $row->user_name;
}
+ if ( isset( $prop['user'] ) ) {
+ $vals['userid'] = $row->pt_user;
+ }
+
if ( isset( $prop['comment'] ) ) {
$vals['comment'] = $row->pt_reason;
}
@@ -177,6 +181,7 @@
ApiBase::PARAM_TYPE => array(
'timestamp',
'user',
+ 'userid',
'comment',
'parsedcomment',
'expiry',
@@ -197,6 +202,7 @@
'Which properties to get',
' timestamp - Adds the timestamp of when
protection was added',
' user - Adds the user to add the
protection',
+ ' userid - Adds the user id to add the
protection',
' comment - Adds the comment for the
protection',
' parsedcomment - Adds the parsed comment for
the protection',
' expiry - Adds the timestamp of when
the protection will be lifted',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
