From 8968f9543fb52b1196a4627ab1ccf777f50c7be9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 6 May 2014 16:18:36 +0200 Subject: Support image operations with Imagick extension (#1489734) --- program/steps/mail/func.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'program/steps/mail/func.inc') diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b9971ce0c..7270cf95a 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1343,12 +1343,10 @@ function rcmail_message_body($attrib) function rcmail_part_image_type($part) { - $rcmail = rcmail::get_instance(); - // Skip TIFF images if browser doesn't support this format... $tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']); // until we can convert them to JPEG - $tiff_support = $tiff_support || $rcmail->config->get('im_convert_path'); + $tiff_support = $tiff_support || rcube_image::is_convertable('image/tiff'); // Content-type regexp $mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i'; -- cgit v1.2.3