diff options
| author | Mario <mario@mariovavti.com> | 2021-01-13 08:54:58 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-13 08:54:58 +0000 |
| commit | b9fd87b004fe083c3f8064de5defea4ff439bce0 (patch) | |
| tree | b56b960e0527d428045903d573a3ff9edf25085a | |
| parent | f430db0de74e886a76da6b0e62554a91204d6dbd (diff) | |
| download | volse-hubzilla-b9fd87b004fe083c3f8064de5defea4ff439bce0.tar.gz volse-hubzilla-b9fd87b004fe083c3f8064de5defea4ff439bce0.tar.bz2 volse-hubzilla-b9fd87b004fe083c3f8064de5defea4ff439bce0.zip | |
do not turn the groups own direkt messages into group items - fixes #1510
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rwxr-xr-x | include/items.php | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -2,7 +2,7 @@ Hubzilla 5.2 (2021-xx-xx) - Use libzotdir for directory - Streamline usage of channel url for keyId - Basic work on PHP8 compatibility - - Improve performance for form post edit action + - Improve performance for forum post edit action - Improve File App tiles view - Update es strings - Update ru strings @@ -23,6 +23,7 @@ Hubzilla 5.2 (2021-xx-xx) - Update composer libs Bugfixes + - Fix direct messages by forum channel turned into group item - Fix ID3Parser composer autoload - Fix issue where directory_fallback_servers were not accessible from static function - Fix missing constant defenition for HUBLOC_OFFLINE diff --git a/include/items.php b/include/items.php index 85465192d..317a84730 100755 --- a/include/items.php +++ b/include/items.php @@ -2673,6 +2673,11 @@ function tag_deliver($uid, $item_id) { } if ($is_group && intval($item['item_private']) === 2 && intval($item['item_thread_top'])) { + + // do not turn the groups own direkt messages into group items + if($item['item_wall'] && $item['author_xchan'] === $u[0]['channel_hash']) + return; + // group delivery via DM if(perm_is_allowed($uid,$item['owner_xchan'],'post_wall') || perm_is_allowed($uid,$item['owner_xchan'],'tag_deliver')) { logger('group DM delivery for ' . $u[0]['channel_address']); |