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

unset item_nocomment when starting a new delivery chain

Browse Source
This commit is contained in:
friendica 2014-09-04 18:52:37 -07:00
parent e426f48a26
commit 955567fe5f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/items.php
View File

@ -2844,7 +2844,6 @@ function tgroup_check($uid,$item) {
function start_delivery_chain($channel,$item,$item_id,$parent) { 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 // 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 // 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; $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 // maintain the original source, which will be the original item owner and was stored in source_xchan
// when we created the delivery fork // 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']) dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan'])
); );
if(! $r) if(! $r)
return false; return false;
@ -2952,9 +2957,11 @@ function check_item_source($uid,$item) {
dbesc($item['owner_xchan']) dbesc($item['owner_xchan'])
); );
if(! $x) if(! $x)
return false; return false;
if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH))
return false; return false;