From 679b8c397114690e5e91d9e89b2e46ec22ba1b0f Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 23 Feb 2009 14:45:09 +0000 Subject: Include jpg as valid graphic files --- modules/watermark/controllers/admin_watermarks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/watermark') diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 54ee71b5..691040ea 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], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG))) { + !in_array($image_info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, "jpg"))) { message::error(t("Unable to identify this image file")); @unlink($file); return; -- cgit v1.2.3