aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Thing.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-05 19:24:03 -0700
committerzotlabs <mike@macgirvin.com>2017-10-05 19:24:03 -0700
commitd2e22d8c2f5ee7c0bca1fa63d39a6822582106e8 (patch)
tree305fbcd0a1e55de48d5e8a406c002f61f3512079 /Zotlabs/Module/Thing.php
parent2862baeee1cbecead3c9d38d2798140ac0256d1a (diff)
parent0ddc3e4af2fe70159b36f86cb367d1a24ec6ac71 (diff)
downloadvolse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.gz
volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.bz2
volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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),