From 2d8b04169dda48a5dba8503d9943bdeee2c64685 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 14 Jul 2012 15:15:30 -0400
Subject: watermarking returns

---
 lib/watermark.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/watermark.php')

diff --git a/lib/watermark.php b/lib/watermark.php
index a2aebffd9..f7c228af1 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -54,11 +54,11 @@ function tp_gd_watermark($image) {
 	}
 
 	// plugins can do their own watermark and return false to prevent this function from running
-	if (trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) {
+	if (elgg_trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) {
 		return;
 	}
 
-	$owner = elgg_get_logged_in_user_guid();
+	$owner = elgg_get_logged_in_user_entity();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
 
@@ -101,7 +101,7 @@ function tp_imagick_watermark($filename) {
 		return true;
 	}
 
-	$owner = get_loggedin_user();
+	$owner = elgg_get_logged_in_user_entity();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
 
@@ -144,7 +144,7 @@ function tp_im_cmdline_watermark($filename) {
 	}
 
 	// plugins can do their own watermark and return false to prevent this function from running
-	if (trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) {
+	if (elgg_trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) {
 		return;
 	}
 
@@ -159,7 +159,7 @@ function tp_im_cmdline_watermark($filename) {
 	}
 
 
-	$owner = get_loggedin_user();
+	$owner = elgg_get_logged_in_user_entity();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
 
-- 
cgit v1.2.3