aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-14 14:53:40 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-14 14:53:40 -0400
commit2893bbf881b1bdca005b4751fbb4e7e1c52f31f8 (patch)
treec81e520b53a6126be9178d945ff829f80961e4fd
parent3639cba1b20c4227def597e67274a184d1ea87d7 (diff)
downloadelgg-2893bbf881b1bdca005b4751fbb4e7e1c52f31f8.tar.gz
elgg-2893bbf881b1bdca005b4751fbb4e7e1c52f31f8.tar.bz2
removed deprecated functions
-rw-r--r--actions/photos/image/untag.php2
-rw-r--r--classes/TidypicsImage.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php
index 012f98930..11c433a61 100644
--- 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 9081bc1fe..672a0df20 100644
--- 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();
}