From bc21cbc465d9cd4d86265246826ba02515541152 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 13 May 2009 13:26:12 +0000 Subject: fixed sorting for most viewed and watermarking files to show proper owner when watermarking images in a group album --- actions/upload.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/upload.php b/actions/upload.php index b31921483..f114f50ad 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -187,7 +187,8 @@ $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $user_stamp_base = dirname(__FILE__) . "/" . $username . "_" . $watermark_filename . "_stamp"; + $viewer = get_loggedin_user(); + $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; -- cgit v1.2.3