diff options
| author | Mario <mario@mariovavti.com> | 2019-06-20 17:32:10 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-20 17:32:10 +0200 |
| commit | 5b727065cf650a982bca0252b36a70acb80d904d (patch) | |
| tree | 7eb3c6d68a596d334b55149a748032cac370564d /Zotlabs/Lib/ThreadItem.php | |
| parent | 8c92b0cd3aaefde7a960fa1811021da247a4e28f (diff) | |
| parent | 952e466d9121726f00c94b6527ff01255529b82c (diff) | |
| download | volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.tar.gz volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.tar.bz2 volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.zip | |
Merge branch 'dev' into 'dev'
changes to support direct messages in zot6 (set item.item_private = 2 when...
See merge request hubzilla/core!1679
Diffstat (limited to 'Zotlabs/Lib/ThreadItem.php')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 9161aa182..5e4600df2 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -98,7 +98,7 @@ class ThreadItem { $conv = $this->get_conversation(); $observer = $conv->get_observer(); - $lock = ((($item['item_private'] == 1) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + $lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? t('Private Message') : false); @@ -110,7 +110,7 @@ class ThreadItem { $shareable = true; $privacy_warning = false; - if(($item['item_private'] == 1) && ($item['owner']['xchan_network'] === 'activitypub')) { + if(intval($item['item_private']) && ($item['owner']['xchan_network'] === 'activitypub')) { $recips = get_iconfig($item['parent'], 'activitypub', 'recips'); if(! in_array($observer['xchan_url'], $recips['to'])) |