From 75b9a7872c1f80d1e3a95796ab4b46ed6ff76e2c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 25 Dec 2008 21:54:09 +0000 Subject: Remove extra uniquifying text that Forge adds to uploaded files. --- modules/watermark/controllers/admin_watermarks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') 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))) { -- cgit v1.2.3