From 2505bd157932a369cc006dd8fc0dd80b57b22b69 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 21 Feb 2009 20:58:02 +0000 Subject: Hardcode extensions instead of using Image::$allowed_types because we don't support TIFF files. TIFF files are not viewable directly in most browsers --- modules/watermark/controllers/admin_watermarks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/watermark/controllers') diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index dc20dc32..42ef0d87 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -99,7 +99,7 @@ class Admin_Watermarks_Controller extends Admin_Controller { $name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]); if (!($image_info = getimagesize($file)) || - !in_array($image_info[2], Image::$allowed_types)) { + !in_array($image_info[2], array("gif", "jpg", "jpeg", "png"))) { message::error(t("Unable to identify this image file")); @unlink($file); return; -- cgit v1.2.3