| Index: trunk/phase3/includes/api/ApiQueryFilearchive.php |
| — | — | @@ -135,7 +135,7 @@ |
| 136 | 136 | self::addTitleInfo( $file, Title::makeTitle( NS_FILE, $row->fa_name ) ); |
| 137 | 137 | |
| 138 | 138 | if ( $fld_sha1 ) { |
| 139 | | - $file['sha1'] = LocalRepo::getHashFromKey( $row->fa_storage_key ); |
| | 139 | + $file['sha1'] = wfBaseConvert( LocalRepo::getHashFromKey( $row->fa_storage_key ), 36, 16, 40 ); |
| 140 | 140 | } |
| 141 | 141 | if ( $fld_timestamp ) { |
| 142 | 142 | $file['timestamp'] = wfTimestamp( TS_ISO_8601, $row->fa_timestamp ); |
| — | — | @@ -155,7 +155,9 @@ |
| 156 | 156 | $file['description'] = $row->fa_description; |
| 157 | 157 | } |
| 158 | 158 | if ( $fld_metadata ) { |
| 159 | | - $file['metadata'] = $row->fa_metadata ? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result ) : null; |
| | 159 | + $file['metadata'] = $row->fa_metadata |
| | 160 | + ? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result ) |
| | 161 | + : null; |
| 160 | 162 | } |
| 161 | 163 | if ( $fld_bitdepth ) { |
| 162 | 164 | $file['bitdepth'] = $row->fa_bits; |