From 2dc186a1d76436782dc624f72ff80ad5d46c0f61 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 6 Mar 2011 20:20:24 +0000 Subject: [PATCH] Followup r83399, add back base conversion --- includes/api/ApiQueryFilearchive.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index cef35c5d3f..84be484110 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -135,7 +135,7 @@ class ApiQueryFilearchive extends ApiQueryBase { self::addTitleInfo( $file, Title::makeTitle( NS_FILE, $row->fa_name ) ); if ( $fld_sha1 ) { - $file['sha1'] = LocalRepo::getHashFromKey( $row->fa_storage_key ); + $file['sha1'] = wfBaseConvert( LocalRepo::getHashFromKey( $row->fa_storage_key ), 36, 16, 40 ); } if ( $fld_timestamp ) { $file['timestamp'] = wfTimestamp( TS_ISO_8601, $row->fa_timestamp ); @@ -155,7 +155,9 @@ class ApiQueryFilearchive extends ApiQueryBase { $file['description'] = $row->fa_description; } if ( $fld_metadata ) { - $file['metadata'] = $row->fa_metadata ? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result ) : null; + $file['metadata'] = $row->fa_metadata + ? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result ) + : null; } if ( $fld_bitdepth ) { $file['bitdepth'] = $row->fa_bits; -- 2.20.1