From 955567fe5f517ec90623a4bf7f652fe2e02e1271 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 18:52:37 -0700 Subject: unset item_nocomment when starting a new delivery chain --- include/items.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 297a62fb4..c96a5e4ed 100755 --- a/include/items.php +++ b/include/items.php @@ -2844,7 +2844,6 @@ function tgroup_check($uid,$item) { function start_delivery_chain($channel,$item,$item_id,$parent) { - // Change this copy of the post to a forum head message and deliver to all the tgroup members // also reset all the privacy bits to the forum default permissions @@ -2858,6 +2857,11 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN; + // unset the nocomment bit if it's there. + + if($flag_bits & ITEM_NOCOMMENT) + $flag_bits = $flag_bits ^ ITEM_NOCOMMENT; + // maintain the original source, which will be the original item owner and was stored in source_xchan // when we created the delivery fork @@ -2944,6 +2948,7 @@ function check_item_source($uid,$item) { dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); + if(! $r) return false; @@ -2951,10 +2956,12 @@ function check_item_source($uid,$item) { intval($uid), dbesc($item['owner_xchan']) ); + if(! $x) return false; + if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) return false; -- cgit v1.2.3