$this->addOption( 'LIMIT', $sqlLimit );
- $this->addFields( 'u1.user_name' );
+ $this->addFields( array(
+ 'u1.user_name',
+ 'u1.user_id'
+ ) );
$this->addFieldsIf( 'u1.user_editcount', $fld_editcount );
$this->addFieldsIf( 'u1.user_registration', $fld_registration );
// Record new user's data
$lastUser = $row->user_name;
- $lastUserData = array( 'name' => $lastUser );
+ $lastUserData = array(
+ 'name' => $lastUser,
+ 'userid' => $row->user_id,
+ );
if ( $fld_blockinfo && !is_null( $row->blocker_name ) ) {
$lastUserData['blockedby'] = $row->blocker_name;
$lastUserData['blockreason'] = $row->ipb_reason;
if ( isset( $prop['timestamp'] ) ) {
$vals['timestamp'] = wfTimestamp( TS_ISO_8601, $file->getTimestamp() );
}
- if ( isset( $prop['user'] ) ) {
- $vals['user'] = $file->getUser();
+ if ( isset( $prop['user'] ) || isset( $prop['userid'] ) ) {
+
+ if ( isset( $prop['user'] ) ) {
+ $vals['user'] = $file->getUser();
+ } else if ( isset( $prop['userid'] ) ) {
+ $vals['userid'] = $file->getUser( 'id' );
+ }
if ( !$file->getUser( 'id' ) ) {
$vals['anon'] = '';
}
return array(
'timestamp',
'user',
+ 'userid',
'comment',
'url',
'size',
'prop' => array(
'What image information to get:',
' timestamp - Adds timestamp for the uploaded version',
- ' user - Adds user for uploaded the image version',
+ ' user - Adds the user who uploaded the image version',
+ ' userid - Add the user id that uploaded the image version',
' comment - Comment on the version',
' url - Gives URL to the image and the description page',
' size - Adds the size of the image in bytes and the height and width',
}
private $fld_ids = false, $fld_flags = false, $fld_timestamp = false, $fld_size = false,
- $fld_comment = false, $fld_parsedcomment = false, $fld_user = false, $fld_content = false, $fld_tags = false;
+ $fld_comment = false, $fld_parsedcomment = false, $fld_user = false, $fld_userid = false,
+ $fld_content = false, $fld_tags = false;
protected function getTokenFunctions() {
// tokenname => function
$this->fld_comment = isset ( $prop['comment'] );
$this->fld_parsedcomment = isset ( $prop['parsedcomment'] );
$this->fld_size = isset ( $prop['size'] );
+ $this->fld_userid = isset( $prop['userid'] );
$this->fld_user = isset ( $prop['user'] );
$this->token = $params['token'];
$vals['minor'] = '';
}
- if ( $this->fld_user ) {
+ if ( $this->fld_user || $this->fld_userid ) {
if ( $revision->isDeleted( Revision::DELETED_USER ) ) {
$vals['userhidden'] = '';
} else {
- $vals['user'] = $revision->getUserText();
+ if ( $this->fld_user ) {
+ $vals['user'] = $revision->getUserText();
+ } else {
+ $user = User::newFromText( $revision->getUserText() );
+ $vals['userid'] = $user->getId();
+ }
if ( !$revision->getUser() ) {
$vals['anon'] = '';
}
'flags',
'timestamp',
'user',
+ 'userid',
'size',
'comment',
'parsedcomment',
' ids - The ID of the revision',
' flags - Revision flags (minor)',
' timestamp - The timestamp of the revision',
- ' user - Gives user to make the revision',
+ ' user - User that made the revision',
+ ' userid - User id of revision creator',
' size - Length of the revision',
' comment - Comment by the user for revision',
' parsedcomment - Parsed comment by the user for the revision',