Merge pull request #114 from shadlaws/fix_1945_followon

Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.

1 files changed, 1 insertions, 1 deletions

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;