diff options
| author | Cash Costello <cash.costello@gmail.com> | 2009-07-12 00:57:56 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2009-07-12 00:57:56 +0000 |
| commit | 533231ec979a907cab73e27013da5f9d69b22121 (patch) | |
| tree | 81a56002efb8148fce281e8259151f4472b34033 /actions | |
| parent | f2d64ceba49e6eef714b5b9432d946e3532efca5 (diff) | |
| download | elgg-533231ec979a907cab73e27013da5f9d69b22121.tar.gz elgg-533231ec979a907cab73e27013da5f9d69b22121.tar.bz2 | |
moving around the watermarking code for supporting other image libs
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/upload.php | 9 |
1 files changed, 1 insertions, 8 deletions
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) {
|