Permalink
Browse files

Merge pull request #114 from shadlaws/fix_1945_followon

Follow-on to 5fca371 for #1945.
  • Loading branch information...
2 parents e17c393 + 8384d79 commit 92bd0dd28ea5d83a06ada2c5287fe9101a95bbdd @bharat bharat committed Jan 31, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 modules/watermark/controllers/admin_watermarks.php
@@ -104,7 +104,7 @@ public function add() {
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;

0 comments on commit 92bd0dd

Please sign in to comment.