Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get the thumbmime from the handler instead of guessing it with UnregisteredLocalFile.

Browse source
This commit is contained in:
Bryan Tong Minh 2011-04-02 14:49:12 +00:00
parent 7afd378a4d
commit 100ecff40e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/api/ApiQueryImageInfo.php
View file

@ -357,9 +357,11 @@ class ApiQueryImageInfo extends ApiQueryBase {
$vals['thumbheight'] = intval( $file->getHeight() );
}
if ( isset( $prop['thumbmime'] ) ) {
$thumbFile = UnregisteredLocalFile::newFromPath( $mto->getPath(), false );
$vals['thumbmime'] = $thumbFile->getMimeType();
if ( isset( $prop['thumbmime'] ) && $file->getHandler() ) {
list( $ext, $mime ) = $file->getHandler()->getThumbType(
substr( $mto->getPath(), strrpos( $mto->getPath(), '.' ) + 1 ),
$file->getMimeType(), $thumbParams );
$vals['thumbmime'] = $mime;
}
} else if ( $mto && $mto->isError() ) {
$vals['thumberror'] = $mto->toText();