removed deprecated functions

diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php
index 012f9893064d579ed47c6f0158734797ca267e88..11c433a61570129bc190fad5d781f41984192f21 100644 (file)
--- a/actions/photos/image/untag.php
+++ b/actions/photos/image/untag.php
@@ -3,7 +3,7 @@
  * Remove photo tag action
  */
 
-$annotation = get_annotation(get_input('annotation_id'));
+$annotation = elgg_get_annotation_from_id(get_input('annotation_id'));
 
 if (!$annotation instanceof ElggAnnotation || $annotation->name != 'phototag') {
        register_error(elgg_echo("tidypics:phototagging:delete:error"));

diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index 9081bc1fe29537d33cffb204ee48b8e71dbd35f8..672a0df203a647b24a0e6d8ba4e171298d5a1eaa 100644 (file)
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -380,21 +380,21 @@ class TidypicsImage extends ElggFile {
                //delete standard thumbnail image
                if ($thumbnail) {
                        $delfile = new ElggFile();
-                       $delfile->owner_guid = $this->getOwner();
+                       $delfile->owner_guid = $this->getOwnerGUID();
                        $delfile->setFilename($thumbnail);
                        $delfile->delete();
                }
                //delete small thumbnail image
                if ($smallthumb) {
                        $delfile = new ElggFile();
-                       $delfile->owner_guid = $this->getOwner();
+                       $delfile->owner_guid = $this->getOwnerGUID();
                        $delfile->setFilename($smallthumb);
                        $delfile->delete();
                }
                //delete large thumbnail image
                if ($largethumb) {
                        $delfile = new ElggFile();
-                       $delfile->owner_guid = $this->getOwner();
+                       $delfile->owner_guid = $this->getOwnerGUID();
                        $delfile->setFilename($largethumb);
                        $delfile->delete();
                }