diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
| commit | 3502a2e86b1d4924fea3b0eac6c3ce499eea2f16 (patch) | |
| tree | 823970af414e5c17ca660fc9cb8d5e6fefa8356d /include/items.php | |
| parent | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.gz volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.bz2 volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index b328ca2d1..26fdc3c5c 100755 --- a/include/items.php +++ b/include/items.php @@ -2148,6 +2148,13 @@ function tag_deliver($uid,$item_id) { $item = $i[0]; + if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK) && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) { + // this is an update to a post which was already processed by us and has a second delivery chain + // Just start the second delivery chain to deliver the updated post + proc_run('php','include/notifier.php','tgroup',$item['id']); + return; + } + if($item['obj_type'] === ACTIVITY_OBJ_TAGTERM) { @@ -2444,7 +2451,7 @@ function check_item_source($uid,$item) { $r = q("select * from source where src_channel_id = %d and src_xchan = '%s' limit 1", intval($uid), - dbesc($item['owner_xchan']) + dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); if(! $r) |