aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Thing.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-05 11:25:39 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-05 11:25:39 +0200
commit5be9477f21626469dedcff4f96243be2bfafdb71 (patch)
treefcf56e3e85e6d28d8901ef3a0a638bfb40212b51 /Zotlabs/Module/Thing.php
parent6f88d5e92be06ad8fa61f900e8a4fb41ba54135e (diff)
parent15b9a67c01964b83ac724945fe416dd35f66e914 (diff)
downloadvolse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.gz
volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.bz2
volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Thing.php')
-rw-r--r--Zotlabs/Module/Thing.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index 95c6c5636..f816632ab 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -91,6 +91,7 @@ class Thing extends \Zotlabs\Web\Controller {
}
$orig_record = $t[0];
if($photo != $orig_record['obj_imgurl']) {
+ delete_thing_photo($orig_record['obj_imgurl'],get_observer_hash());
$arr = import_xchan_photo($photo,get_observer_hash(),true);
$local_photo = $arr[0];
$local_photo_type = $arr[3];
@@ -336,6 +337,9 @@ class Thing extends \Zotlabs\Web\Controller {
return '';
}
+
+ delete_thing_photo($r[0]['obj_imgurl'],get_observer_hash());
+
$x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d",
dbesc($thing_hash),
intval(TERM_OBJ_THING),