diff options
Diffstat (limited to 'includes/api/ApiQueryLogEvents.php')
| -rw-r--r-- | includes/api/ApiQueryLogEvents.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 73dcea49..1a2719ed 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -49,12 +49,12 @@ class ApiQueryLogEvents extends ApiQueryBase { $this->fld_ids = isset( $prop['ids'] ); $this->fld_title = isset( $prop['title'] ); $this->fld_type = isset( $prop['type'] ); - $this->fld_action = isset ( $prop['action'] ); + $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'] ); + $this->fld_parsedcomment = isset( $prop['parsedcomment'] ); $this->fld_details = isset( $prop['details'] ); $this->fld_tags = isset( $prop['tags'] ); @@ -67,7 +67,7 @@ class ApiQueryLogEvents extends ApiQueryBase { $this->addTables( array( 'logging', 'user', 'page' ) ); $this->addOption( 'STRAIGHT_JOIN' ); $this->addJoinConds( array( - 'user' => array( 'JOIN', + 'user' => array( 'LEFT JOIN', 'user_id=log_user' ), 'page' => array( 'LEFT JOIN', array( 'log_namespace=page_namespace', @@ -82,8 +82,8 @@ class ApiQueryLogEvents extends ApiQueryBase { ) ); $this->addFieldsIf( array( 'log_id', 'page_id' ), $this->fld_ids ); - $this->addFieldsIf( array( 'log_user', 'user_name' ), $this->fld_user ); - $this->addFieldsIf( 'user_id', $this->fld_userid ); + $this->addFieldsIf( array( 'log_user', 'log_user_text', 'user_name' ), $this->fld_user ); + $this->addFieldsIf( 'log_user', $this->fld_userid ); $this->addFieldsIf( array( 'log_namespace', 'log_title' ), $this->fld_title || $this->fld_parsedcomment ); $this->addFieldsIf( 'log_comment', $this->fld_comment || $this->fld_parsedcomment ); $this->addFieldsIf( 'log_params', $this->fld_details ); @@ -98,8 +98,7 @@ class ApiQueryLogEvents extends ApiQueryBase { $this->addTables( 'change_tag' ); $this->addJoinConds( array( 'change_tag' => array( 'INNER JOIN', array( 'log_id=ct_log_id' ) ) ) ); $this->addWhereFld( 'ct_tag', $params['tag'] ); - global $wgOldChangeTagsIndex; - $index['change_tag'] = $wgOldChangeTagsIndex ? 'ct_tag' : 'change_tag_tag_id'; + $index['change_tag'] = 'change_tag_tag_id'; } if ( !is_null( $params['action'] ) ) { @@ -241,7 +240,7 @@ class ApiQueryLogEvents extends ApiQueryBase { break; case 'rights': $vals2 = array(); - if( $legacy ) { + if ( $legacy ) { list( $vals2['old'], $vals2['new'] ) = $params; } else { $vals2['new'] = implode( ', ', $params['5::newgroups'] ); @@ -265,6 +264,11 @@ class ApiQueryLogEvents extends ApiQueryBase { $vals[$type] = $vals2; $params = null; break; + case 'upload': + if ( isset( $params['img_timestamp'] ) ) { + $params['img_timestamp'] = wfTimestamp( TS_ISO_8601, $params['img_timestamp'] ); + } + break; } if ( !is_null( $params ) ) { $logParams = array(); @@ -331,10 +335,10 @@ class ApiQueryLogEvents extends ApiQueryBase { $vals['userhidden'] = ''; } else { if ( $this->fld_user ) { - $vals['user'] = $row->user_name; + $vals['user'] = $row->user_name === null ? $row->log_user_text : $row->user_name; } if ( $this->fld_userid ) { - $vals['userid'] = $row->user_id; + $vals['userid'] = $row->log_user; } if ( !$row->log_user ) { |