From f1a3b281d4573e12f7a81efa03fb1db73ba34e27 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Oct 2015 19:59:50 +0100
Subject: pathinfo() does not work in this case. getimagesize() seems more
 reliabel. this fixes transparent png avatars having a black background.

---
 include/photo/photo_driver.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include/photo/photo_driver.php')

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 5d61556ab..db98f7085 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -541,7 +541,7 @@ function guess_image_type($filename, $headers = '') {
 				// we aren't using imagick can find it
 			}
 		}
-
+/*
 		if(is_null($type)) {
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
 			$ph = photo_factory('');
@@ -551,6 +551,14 @@ function guess_image_type($filename, $headers = '') {
 				if ($ext==$e) $type = $m;
 			}
 		}
+*/
+		if(is_null($type)) {
+			$size = getimagesize($filename);
+			$ph = photo_factory('');
+			$types = $ph->supportedTypes();
+			$type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg');
+		}
+
 	}
 	logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
 	return $type;
-- 
cgit v1.2.3