watermarking returns

diff --git a/lib/watermark.php b/lib/watermark.php
index a2aebffd94334f977a982e7f443b3a2b29368b05..f7c228af13655ea7e614c979569804c6f8c24697 100644 (file)
--- 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);
 

diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
index 2b6399a677457bf7fb592650fdd8820265910bb4..7e9c17ac251636f266ab4fabd2e8121abbe522a8 100644 (file)
--- a/views/default/forms/photos/admin/settings.php
+++ b/views/default/forms/photos/admin/settings.php
@@ -28,10 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo("save")));
 return true;
 
 
-// Watermark Text
-$form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";
-
 // Quota Size
 $quota = $plugin->quota;
 if (!$quota) {

diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index 349c951f9481f6145672f961d2f1dc5b5c832fd0..352a9c5a15defef61582c0f10ba242039d500d70 100644 (file)
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -26,3 +26,11 @@ echo elgg_view('input/text', array(
        'value' => $plugin->maxfilesize,
 ));
 echo '</div>';
+
+// Watermark Text
+echo '<div>' . elgg_echo('tidypics:settings:watermark');
+echo elgg_view("input/text", array(
+       'name' => 'params[watermark_text]',
+       'value' => $plugin->watermark_text,
+));
+echo '</div>';