Merge pull request #114 from shadlaws/fix_1945_followon

Follow-on to 5fca371a61 for #1945.
This commit is contained in:
Bharat Mediratta
2013-01-31 11:42:09 -08:00

View File

@@ -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;