diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-02-21 20:58:02 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-02-21 20:58:02 +0000 |
| commit | 2505bd157932a369cc006dd8fc0dd80b57b22b69 (patch) | |
| tree | 21b064cb7a1fa1cd99ebc6238cd5bcc680dea683 /modules/watermark | |
| parent | 855eadb92fc4b63a8a46004e1c59f0b221e72330 (diff) | |
Hardcode extensions instead of using Image::$allowed_types because we
don't support TIFF files. TIFF files are not viewable directly in
most browsers
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 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; |