diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-02-23 14:45:09 +0000 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-02-23 14:45:09 +0000 |
| commit | 679b8c397114690e5e91d9e89b2e46ec22ba1b0f (patch) | |
| tree | 79b6a078f0d34153af38e9a6f581cfdc657ab397 /modules/watermark | |
| parent | 8bba897a46e773c0155419abc7b0d9a1fb5fd7aa (diff) | |
Include jpg as valid graphic files
Diffstat (limited to 'modules/watermark')
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; |