diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:19:19 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:19:19 +0200 |
| commit | 1b1d11dcf1091158232e98abad966d4900e2ccc9 (patch) | |
| tree | 380d5e04c73391089bf3d658ea4b27eecffa4916 /include/zot.php | |
| parent | b655d04b3474893ee3dea99b77f2e7dd764729a0 (diff) | |
| parent | 35200e5f1b10cdd18af8f0ea646996e438b97011 (diff) | |
| download | volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.gz volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.bz2 volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.zip | |
Merge branch '3.6RC'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index 8e14bb37c..19e1298c3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1787,6 +1787,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $local_public = false; continue; } + if(! \Zotlabs\Lib\MessageFilter::evaluate($arr,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { + $local_public = false; + continue; + } } $tag_delivery = tgroup_check($channel['channel_id'],$arr); @@ -1923,6 +1927,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ continue; } + $r = q("select * from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval($channel['channel_id']) |