summaryrefslogtreecommitdiff
path: root/modules/watermark
diff options
context:
space:
mode:
Diffstat (limited to 'modules/watermark')
-rw-r--r--modules/watermark/controllers/admin_watermarks.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index e6ef55b7..353f81c3 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -23,7 +23,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
if (request::method() == "post" && $form->validate()) {
$file = $_POST["file"];
$pathinfo = pathinfo($file);
- $name = $pathinfo["basename"];
+ $name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]);
if (ORM::factory("watermark")->where("name", $name)->count_all() > 0) {
message::add(_("There is already a watermark with that name"), log::WARNING);
} else if (!($image_info = getimagesize($file))) {