diff options
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index acdae90b2..297a62fb4 100755 --- a/include/items.php +++ b/include/items.php @@ -2938,9 +2938,6 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { 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", intval($uid), @@ -2950,7 +2947,7 @@ function check_item_source($uid,$item) { if(! $r) 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), dbesc($item['owner_xchan']) ); @@ -2961,6 +2958,10 @@ function check_item_source($uid,$item) { if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) return false; + if($item['item_private'] && (! ($x[0]['abook_flags'] & ABOOK_FLAG_FEED))) + return false; + + if($r[0]['src_channel_xchan'] === $item['owner_xchan']) return false; |