| Index: branches/REL1_17/phase3/includes/api/ApiQueryFilearchive.php |
| — | — | @@ -69,7 +69,10 @@ |
| 70 | 70 | $this->addFields( 'fa_name' ); |
| 71 | 71 | $this->addFieldsIf( 'fa_storage_key', $fld_sha1 ); |
| 72 | 72 | $this->addFieldsIf( 'fa_timestamp', $fld_timestamp ); |
| 73 | | - $this->addFieldsIf( 'fa_user', $fld_user ); |
| | 73 | + |
| | 74 | + if ( $fld_user ) { |
| | 75 | + $this->addFields( array( 'fa_user', 'fa_user_text' ) ); |
| | 76 | + } |
| 74 | 77 | $this->addFieldsIf( 'fa_size', $fld_size ); |
| 75 | 78 | |
| 76 | 79 | if ( $fld_dimensions ) { |
| — | — | @@ -137,7 +140,8 @@ |
| 138 | 141 | $file['timestamp'] = wfTimestamp( TS_ISO_8601, $row->fa_timestamp ); |
| 139 | 142 | } |
| 140 | 143 | if ( $fld_user ) { |
| 141 | | - $file['user'] = $row->fa_user; |
| | 144 | + $file['userid'] = $row->fa_user; |
| | 145 | + $file['user'] = $row->fa_user_text; |
| 142 | 146 | } |
| 143 | 147 | if ( $fld_size ) { |
| 144 | 148 | $file['size'] = $row->fa_size; |
| — | — | @@ -227,7 +231,7 @@ |
| 228 | 232 | 'What image information to get:', |
| 229 | 233 | ' sha1 - Adds sha1 hash for the image', |
| 230 | 234 | ' timestamp - Adds timestamp for the uploaded version', |
| 231 | | - ' user - Adds user for uploaded the image version', |
| | 235 | + ' user - Adds user who uploaded the image version', |
| 232 | 236 | ' size - Adds the size of the image in bytes', |
| 233 | 237 | ' dimensions - Adds the height and width of the image', |
| 234 | 238 | ' description - Adds description the image version', |