aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-12-10 18:38:50 -0800
committerzotlabs <mike@macgirvin.com>2017-12-10 18:38:50 -0800
commitc2990964f07edaae447587e50c28e9a9eeb9bc80 (patch)
tree55b29e51c720b6907beab28e50fcdc331c4c5972 /include/items.php
parentd4bb6c17d1a8d9d9179136790142a53f1898f12c (diff)
downloadvolse-hubzilla-c2990964f07edaae447587e50c28e9a9eeb9bc80.tar.gz
volse-hubzilla-c2990964f07edaae447587e50c28e9a9eeb9bc80.tar.bz2
volse-hubzilla-c2990964f07edaae447587e50c28e9a9eeb9bc80.zip
regression in channel sources delivery
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php16
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);
+
+ }
+
}
/**