harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #230 - deletion failure in multiple delivery chains

Browse Source
This commit is contained in:
friendica 2013-12-26 00:14:17 -08:00
parent f133218b33
commit 152ed96379
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/zot.php
View File

@ -1384,7 +1384,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) {
require_once('include/event.php'); require_once('include/event.php');
$ev = bbtoevent($arr['body']); $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['event_xchan'] = $arr['author_xchan'];
$ev['uid'] = $channel['channel_id']; $ev['uid'] = $channel['channel_id'];
$ev['account'] = $channel['channel_account_id']; $ev['account'] = $channel['channel_account_id'];
@ -1539,6 +1539,9 @@ function delete_imported_item($sender,$item,$uid) {
require_once('include/items.php'); require_once('include/items.php');
drop_item($r[0]['id'],false); drop_item($r[0]['id'],false);
tag_deliver($uid,$r[0]['id']);
return $r[0]['id']; return $r[0]['id'];
} }

2
version.inc
View File

@ -1 +1 @@
2013-12-25.537 2013-12-26.538