aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-06-28 01:37:36 +0000
committerMario <mario@mariovavti.com>2019-06-28 09:38:28 +0200
commitddde4e19659862f6147c304224c390119bdb4d0a (patch)
treea4bb04bd87084ab91d130ff1b9e764882575c820 /Zotlabs
parent145295302d74af176d3f25d871cf6979bf36bc23 (diff)
downloadvolse-hubzilla-ddde4e19659862f6147c304224c390119bdb4d0a.tar.gz
volse-hubzilla-ddde4e19659862f6147c304224c390119bdb4d0a.tar.bz2
volse-hubzilla-ddde4e19659862f6147c304224c390119bdb4d0a.zip
extend definition of direct message to anything with allow_cid but *not* allow_gid.
(cherry picked from commit 96a99935ef4f2da899275166b127537287966dac)
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Item.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index cb78e4047..d03b6ee30 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -760,7 +760,12 @@ class Item extends Controller {
}
}
}
-
+
+ if(($str_contact_allow) && (! $str_group_allow)) {
+ // direct message - private between individual channels but not groups
+ $private = 2;
+ }
+
/**
*