summaryrefslogtreecommitdiff
path: root/modules/watermark
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2012-05-17 20:25:27 -0700
committerBharat Mediratta <bharat@menalto.com>2012-05-17 20:25:27 -0700
commit9e2ea2ffedb22f83137db4e5ba4c06b91f11e09d (patch)
tree2af0965685141af9cabcb01095dc431954de40e2 /modules/watermark
parent931da5f2ff68e3e4414583c39a22d62f13f87960 (diff)
Smash multiple extensions down into a single one when accepting file
uploads. Fixes #1872.
Diffstat (limited to 'modules/watermark')
-rw-r--r--modules/watermark/controllers/admin_watermarks.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 92a44a86..a80f82a9 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -98,6 +98,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
$pathinfo = pathinfo($file);
// Forge prefixes files with "uploadfile-xxxxxxx" for uniqueness
$name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]);
+ $name = legal_file::smash_extensions($name);
if (!($image_info = getimagesize($file)) ||
!in_array($image_info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG))) {