diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php index 4d1f67562..06fb2e30e 100644 --- a/plugins/avatars/index.php +++ b/plugins/avatars/index.php @@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin NAME = 'Avatars', AUTHOR = 'SnappyMail', URL = 'https://snappymail.eu/', - VERSION = '1.12', - RELEASE = '2023-11-27', + VERSION = '1.13', + RELEASE = '2024-01-16', REQUIRED = '2.25.0', CATEGORY = 'Contacts', LICENSE = 'MIT', @@ -316,7 +316,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin if ($aFiles) { \MailSo\Base\Http::setLastModified(\filemtime($aFiles[0])); return [ - \mime_content_type($aFiles[0]), + \SnappyMail\File\MimeType::fromFile($aFiles[0]), \file_get_contents($aFiles[0]) ]; } diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php index 8d41bf681..e64b57293 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php @@ -35,6 +35,9 @@ abstract class MimeType if (self::$finfo) { $mime = \preg_replace('#[,;].*#', '', self::$finfo->file($filename)); } + if (!$mime && \is_callable('mime_content_type')) { + $mime = \mime_content_type($filename); + } if (!$mime && $fp = \fopen($filename, 'rb')) { $mime = self::fromStream($fp); \fclose($fp);