From 8384d7948e257c9bc825c2d45da9630d00c603f0 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Thu, 31 Jan 2013 12:40:55 +0100 Subject: Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945. Previously skipped admin_watermarks mods to use new functionality of #1945 since there was concurrent work on it with #1970. Now that both are done, we can wrap this up. --- modules/watermark/controllers/admin_watermarks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') 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; -- cgit v1.2.3