diff options
| author | Greg Froese <greg.froese@gmail.com> | 2009-05-17 04:55:50 +0000 |
|---|---|---|
| committer | Greg Froese <greg.froese@gmail.com> | 2009-05-17 04:55:50 +0000 |
| commit | 185ec702edbc5e1f9b636454e5282fa718da7b56 (patch) | |
| tree | 4f99d8a8eda3243d077243baf58c093aa712e49b /actions/upload.php | |
| parent | 600effcfc450689f3a01788da0fc8ded87bb45ae (diff) | |
| download | elgg-185ec702edbc5e1f9b636454e5282fa718da7b56.tar.gz elgg-185ec702edbc5e1f9b636454e5282fa718da7b56.tar.bz2 | |
missed language file
Diffstat (limited to 'actions/upload.php')
| -rw-r--r-- | actions/upload.php | 3 |
1 files changed, 2 insertions, 1 deletions
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();
|