From 533231ec979a907cab73e27013da5f9d69b22121 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 12 Jul 2009 00:57:56 +0000 Subject: moving around the watermarking code for supporting other image libs --- actions/upload.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'actions') diff --git a/actions/upload.php b/actions/upload.php index f062edc80..b74f72c7b 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -7,7 +7,6 @@ global $CONFIG; include dirname(dirname(__FILE__)) . "/lib/resize.php"; - include dirname(dirname(__FILE__)) . "/lib/watermark.php"; include dirname(dirname(__FILE__)) . "/lib/exif.php"; // Get common variables @@ -155,16 +154,10 @@ if ($image_lib == 'ImageMagick') { // ImageMagick command line - $thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename); - if(!count($thumbs)) { + if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) { trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING); } - $album = get_entity($container_guid); - - tp_watermark($thumbs); - - } else if ($image_lib == 'ImageMagickPHP') { // ImageMagick PHP if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) { -- cgit v1.2.3