diff options
| author | friendica <info@friendica.com> | 2013-12-26 00:14:17 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-26 00:14:17 -0800 |
| commit | 152ed9637926f478a6d15a29950f085117172a6f (patch) | |
| tree | b7cda964ab1dc86232a15eb1105c550b53a21aa9 | |
| parent | f133218b33f0c7f9e4234aa2f4f85ae984ac726d (diff) | |
| download | volse-hubzilla-152ed9637926f478a6d15a29950f085117172a6f.tar.gz volse-hubzilla-152ed9637926f478a6d15a29950f085117172a6f.tar.bz2 volse-hubzilla-152ed9637926f478a6d15a29950f085117172a6f.zip | |
issue #230 - deletion failure in multiple delivery chains
| -rw-r--r-- | include/zot.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 9d3e66e40..9d6f462fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1384,7 +1384,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) { if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { require_once('include/event.php'); $ev = bbtoevent($arr['body']); - if(x($ev,'desc') && x($ev,'start')) { + if(x($ev,'desc') && x($ev,'start')) { $ev['event_xchan'] = $arr['author_xchan']; $ev['uid'] = $channel['channel_id']; $ev['account'] = $channel['channel_account_id']; @@ -1539,6 +1539,9 @@ function delete_imported_item($sender,$item,$uid) { require_once('include/items.php'); drop_item($r[0]['id'],false); + + tag_deliver($uid,$r[0]['id']); + return $r[0]['id']; } diff --git a/version.inc b/version.inc index bdcfdd8ad..a5b44289f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-25.537 +2013-12-26.538 |