summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorshadlaws <shad@shadlaws.com>2013-01-31 12:40:55 +0100
committershadlaws <shad@shadlaws.com>2013-01-31 12:40:55 +0100
commit8384d7948e257c9bc825c2d45da9630d00c603f0 (patch)
tree202a1950a7b0e06ee74a81f2d0eee63044ef9b2c /modules
parente17c39386b9d322f9bafd8b548ec6b94a7c5f7b5 (diff)
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.
Diffstat (limited to 'modules')
-rw-r--r--modules/watermark/controllers/admin_watermarks.php2
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;