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

oops forgot about the privacy exclusion

Browse Source
This commit is contained in:
friendica 2014-09-04 18:06:59 -07:00
parent 50c137d152
commit e426f48a26
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/items.php
View File

@ -2938,9 +2938,6 @@ function start_delivery_chain($channel,$item,$item_id,$parent) {
function check_item_source($uid,$item) { function check_item_source($uid,$item) {
if($item['item_private'])
return false;
$r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' || src_xchan = '*' ) limit 1", $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' || src_xchan = '*' ) limit 1",
intval($uid), intval($uid),
@ -2950,7 +2947,7 @@ function check_item_source($uid,$item) {
if(! $r) if(! $r)
return false; return false;
$x = q("select abook_their_perms from abook where abook_channel = %d and abook_xchan = '%s' limit 1", $x = q("select abook_their_perms, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
intval($uid), intval($uid),
dbesc($item['owner_xchan']) dbesc($item['owner_xchan'])
); );
@ -2961,6 +2958,10 @@ function check_item_source($uid,$item) {
if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH))
return false; return false;
if($item['item_private'] && (! ($x[0]['abook_flags'] & ABOOK_FLAG_FEED)))
return false;
if($r[0]['src_channel_xchan'] === $item['owner_xchan']) if($r[0]['src_channel_xchan'] === $item['owner_xchan'])
return false; return false;