diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-12-25 21:54:09 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-12-25 21:54:09 +0000 |
| commit | 75b9a7872c1f80d1e3a95796ab4b46ed6ff76e2c (patch) | |
| tree | 10c8423245d8c82f8bd5ebecd9874a58dd181287 /modules/watermark | |
| parent | 71d0373838927f1658db45dbb235fef318cc308c (diff) | |
Remove extra uniquifying text that Forge adds to uploaded files.
Diffstat (limited to 'modules/watermark')
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 2 |
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))) { |