diff options
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.build_number b/.build_number index 838831f2..95dbfdcc 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=315 +build_number=316 diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 2d656c9f..27c2efc9 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -104,7 +104,7 @@ class Admin_Watermarks_Controller extends Admin_Controller { list ($width, $height, $mime_type, $extension) = photo::get_file_metadata($file); if (!$width || !$height || !$mime_type || !$extension || - !in_array($extension, legal_file::get_photo_extensions())) { + !legal_file::get_photo_extensions($extension)) { message::error(t("Invalid or unidentifiable image file")); @unlink($file); return; |