diff options
author | zotlabs <mike@macgirvin.com> | 2019-06-19 17:32:38 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-06-19 17:32:38 -0700 |
commit | 9d156141b1205e48bbb3008f2a3040caa4c33192 (patch) | |
tree | e3931bb66439f751b89b0063334c011872430bab /Zotlabs/Module/Item.php | |
parent | becaa3b920bfe87c031c01bdf35d35db5c82e31e (diff) | |
download | volse-hubzilla-9d156141b1205e48bbb3008f2a3040caa4c33192.tar.gz volse-hubzilla-9d156141b1205e48bbb3008f2a3040caa4c33192.tar.bz2 volse-hubzilla-9d156141b1205e48bbb3008f2a3040caa4c33192.zip |
changes to support direct messages in zot6 (set item.item_private = 2 when private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage)
Diffstat (limited to 'Zotlabs/Module/Item.php')
-rw-r--r-- | Zotlabs/Module/Item.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 965cbf173..901f54c72 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -551,10 +551,10 @@ class Item extends Controller { $public_policy = $orig_post['public_policy']; $private = $orig_post['item_private']; } - - if($private || $public_policy || $acl->is_private()) - $private = 1; - + + if($public_policy || $acl->is_private()) { + $private = (($private) ? $private : 1); + } $location = $orig_post['location']; $coord = $orig_post['coord']; @@ -631,12 +631,11 @@ class Item extends Controller { $allow_empty = ((array_key_exists('allow_empty',$_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0); - $private = intval($acl->is_private() || ($public_policy)); + $private = (($private) ? $private : intval($acl->is_private() || ($public_policy))); // If this is a comment, set the permissions from the parent. if($parent_item) { - $private = 0; $acl->set($parent_item); $private = intval($acl->is_private() || $parent_item['item_private']); $public_policy = $parent_item['public_policy']; |