reverting 36b5f6ac
This commit is contained in:
parent
f88dc84091
commit
ef73880459
@ -1537,17 +1537,24 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
|
|||||||
|
|
||||||
$tag_delivery = tgroup_check($channel['channel_id'],$arr);
|
$tag_delivery = tgroup_check($channel['channel_id'],$arr);
|
||||||
|
|
||||||
if ($arr['mid'] == $arr['parent_mid']){
|
|
||||||
$perm = 'send_stream';
|
$perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments');
|
||||||
}
|
|
||||||
else{
|
// checkin 36b5f6ac - multiple issues, not yet ready for prime time
|
||||||
$r = q("select item_owner from item where item.mid == '%s' limit 1",
|
// currently this is mostly fixed except for what to do if the post is in a second delivery chain
|
||||||
dbesc($arr['parent_mid']));
|
// if ($arr['mid'] == $arr['parent_mid']){
|
||||||
if($channel['channel_hash'] == $r[0]['item_owner'])
|
// $perm = 'send_stream';
|
||||||
$perm = 'post_comments';
|
// }
|
||||||
else
|
// else{
|
||||||
$perm = 'send_stream';
|
// $perm = 'post_comments';
|
||||||
}
|
//
|
||||||
|
// $r = q("select owner_xchan from item where item.mid = '%s' and uid = %d limit 1",
|
||||||
|
// dbesc($arr['parent_mid']),
|
||||||
|
// intval($channel['channel_id'])
|
||||||
|
// );
|
||||||
|
// if(($r) && $channel['channel_hash'] !== $r[0]['owner_xchan'])
|
||||||
|
// $perm = 'send_stream';
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
// This is our own post, possibly coming from a channel clone
|
// This is our own post, possibly coming from a channel clone
|
||||||
|
Reference in New Issue
Block a user