From 185ec702edbc5e1f9b636454e5282fa718da7b56 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 17 May 2009 04:55:50 +0000 Subject: missed language file --- actions/upload.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actions/upload.php') diff --git a/actions/upload.php b/actions/upload.php index 295bf9437..e24b48af8 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -198,7 +198,9 @@ } if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + $viewer = get_loggedin_user(); $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); if( $watermark_text ) { //get this value from the plugin settings if( $thumblarge ) { $ext = ".png"; @@ -207,7 +209,6 @@ $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $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(); -- cgit v1.2.3