diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
| commit | 6413395a76d57960708f17016f04a682b3643aa7 (patch) | |
| tree | 32ba1c7156f4e7c4bc72dcea384bfedf2d35834c /include/items.php | |
| parent | 6cc906fd1d7226e4db2f546551c14fe04ea815e7 (diff) | |
| parent | 1d96e165e00ed54df0573bda79c2a274f21aeb16 (diff) | |
| download | volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.gz volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.bz2 volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 6447de4e7..19de52e92 100755 --- a/include/items.php +++ b/include/items.php @@ -66,6 +66,8 @@ function collect_recipients($item,&$private_envelope) { // by the directives in $item['public_policy']. $private_envelope = false; + require_once('include/identity.php'); + $sys = get_sys_channel(); if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { $r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", @@ -95,6 +97,9 @@ function collect_recipients($item,&$private_envelope) { } } } +// we probably want to check that discovery channel delivery is allowed before uncommenting this. +// if($policy === 'pub') +// $recipients[] = $sys['xchan_hash']; } } |