diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2012-03-16 22:51:12 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2012-03-16 22:51:12 -0700 |
| commit | 5cc8de829c0a7b86c8df27293f4825d0e340d592 (patch) | |
| tree | 62b71d96d02fce3a75393da08219714fdad4789d /lib/watermark.php | |
| parent | e6e33ca1a7afb00a855f57df5a5263674b23c93c (diff) | |
| download | elgg-5cc8de829c0a7b86c8df27293f4825d0e340d592.tar.gz elgg-5cc8de829c0a7b86c8df27293f4825d0e340d592.tar.bz2 | |
Fixes #14. Fixed uploadify.
Diffstat (limited to 'lib/watermark.php')
| -rw-r--r-- | lib/watermark.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/watermark.php b/lib/watermark.php index ce77c00e2..5b9a4abcd 100644 --- a/lib/watermark.php +++ b/lib/watermark.php @@ -48,7 +48,7 @@ function tp_get_watermark_filename($text, $owner) { function tp_gd_watermark($image) { global $CONFIG; - $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); if (!$watermark_text) { return; } @@ -58,7 +58,7 @@ function tp_gd_watermark($image) { return; } - $owner = get_loggedin_user(); + $owner = elgg_get_logged_in_user_guid(); $watermark_text = tp_process_watermark_text($watermark_text, $owner); @@ -91,13 +91,13 @@ function tp_gd_watermark($image) { */ function tp_imagick_watermark($filename) { - $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); if (!$watermark_text) { return false; } // plugins can do their own watermark and return false to prevent this function from running - if (trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) { + if (elgg_trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) { return true; } |