diff options
| author | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
| commit | 215d615fc3bb9e168e21a78a6319a7971c4d1e9e (patch) | |
| tree | ff0af309ef283c48a6f3df5d590068c103d6bf7a /include/items.php | |
| parent | 979c05b24da0497be582aacaa8b744f692b56ccf (diff) | |
| parent | d0956eb39d7a361639f5cd73fb1c3c8463fb1e99 (diff) | |
| download | volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.gz volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.bz2 volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index e4727e19e..7948a7c22 100755 --- a/include/items.php +++ b/include/items.php @@ -2694,8 +2694,8 @@ function tag_deliver($uid, $item_id) { } - if((! $mention) && (! $union)) { - logger('No mention for ' . $u[0]['channel_name'] . ' and no union.'); + if(! $mention) { + logger('No mention for ' . $u[0]['channel_name']); continue; } @@ -2714,6 +2714,18 @@ function tag_deliver($uid, $item_id) { } } + + if($union) { + if(intval($item['item_wall']) || intval($item['item_origin']) || (! intval($item['item_thread_top'])) || ($item['id'] != $item['parent'])) { + logger('Item was local or a comment. rejected.'); + return; + } + + logger('Creating second delivery chain.'); + start_delivery_chain($u[0],$item,$item_id,null); + + } + } /** |