diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
| commit | b52e834bd0bab530e98537d52b31d4b37f199739 (patch) | |
| tree | ff31dd4f6c2afaeae380f10dc691cde3cb4e6739 /modules/watermark/controllers | |
| parent | f5098f54b8279f468d94747b1156e15ea05d6d25 (diff) | |
| parent | 4c98b218316df00c8bf3eeb28a8324ec64348bff (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/watermark/controllers')
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 1 |
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))) { |