diff options
| -rw-r--r-- | modules/local_import/controllers/local_import.php | 2 | ||||
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/local_import/controllers/local_import.php b/modules/local_import/controllers/local_import.php index 7302aae5..ce09240d 100644 --- a/modules/local_import/controllers/local_import.php +++ b/modules/local_import/controllers/local_import.php @@ -92,7 +92,7 @@ class Local_Import_Controller extends Controller { $extension = strtolower(substr(strrchr($file, '.'), 1)); // Make sure the file is readable if (is_readable($full_path) && - in_array($extension, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, "flv"))) { + in_array($extension, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, "jpg", IMAGETYPE_PNG, "flv"))) { $file_list[$file] = array("path" => $full_path); } } diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 54ee71b5..691040ea 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -99,7 +99,7 @@ class Admin_Watermarks_Controller extends Admin_Controller { $name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]); if (!($image_info = getimagesize($file)) || - !in_array($image_info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG))) { + !in_array($image_info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, "jpg"))) { message::error(t("Unable to identify this image file")); @unlink($file); return; |