keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

guess_image_type now uses Imagick::getImageMimeType()

Browse source
This commit is contained in:
Domovoy 2012-07-22 15:17:40 +02:00
parent 5d0bd98d2a
commit 0acb983be4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Photo.php
View file

@ -600,7 +600,7 @@ function guess_image_type($filename, $fromcurl=false) {
* we won't be tricked by a manipulated extension * we won't be tricked by a manipulated extension
*/ */
$image = new Imagick($filename); $image = new Imagick($filename);
$type = 'image/'. strtolower($image->getImageFormat()); $type = $image->getImageMimeType();
} else { } else {
$ext = pathinfo($filename, PATHINFO_EXTENSION); $ext = pathinfo($filename, PATHINFO_EXTENSION);
$types = Photo::supportedTypes(); $types = Photo::supportedTypes();