aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-05-25 20:07:31 -0400
committerAndrew Manning <tamanning@zoho.com>2018-05-25 20:07:31 -0400
commited17e8a6499e48b032393be351c39f31a0edcbf3 (patch)
tree42c00549dba641bc7c8e6547fc2ef131bdd60cd6 /Zotlabs
parentfc6b337bbbd2fd3b5412c8b957122830f73feb2d (diff)
parent33700e9cf47e2b5f0b4597772d9cea81e811bae3 (diff)
downloadvolse-hubzilla-ed17e8a6499e48b032393be351c39f31a0edcbf3.tar.gz
volse-hubzilla-ed17e8a6499e48b032393be351c39f31a0edcbf3.tar.bz2
volse-hubzilla-ed17e8a6499e48b032393be351c39f31a0edcbf3.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/ThreadItem.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 0fed78158..a3c7f99b9 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -103,8 +103,12 @@ class ThreadItem {
$shareable = true;
$privacy_warning = false;
- if($item['owner']['xchan_network'] === 'activitypub')
- $privacy_warning = true;
+ if(($item['item_private'] == 1) && ($item['owner']['xchan_network'] === 'activitypub')) {
+ $recips = get_iconfig($item['parent'], 'activitypub', 'recips');
+
+ if(! in_array($observer['xchan_url'], $recips['to']))
+ $privacy_warning = true;
+ }
$mode = $conv->get_mode();