diff options
author | Mario <mario@mariovavti.com> | 2021-01-13 09:01:31 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-01-13 09:01:31 +0000 |
commit | 08f717d4fc27ff763c7f0380b5f24065ba62abd5 (patch) | |
tree | a6e5b650f0f4cd3dfcde2961eec419986a6ae1f3 /include/items.php | |
parent | 1615f2c79a38a094264ca9e78f39ac9f59a151e4 (diff) | |
parent | b9fd87b004fe083c3f8064de5defea4ff439bce0 (diff) | |
download | volse-hubzilla-08f717d4fc27ff763c7f0380b5f24065ba62abd5.tar.gz volse-hubzilla-08f717d4fc27ff763c7f0380b5f24065ba62abd5.tar.bz2 volse-hubzilla-08f717d4fc27ff763c7f0380b5f24065ba62abd5.zip |
Merge branch 'dev' into 5.2RC
Diffstat (limited to 'include/items.php')
-rwxr-xr-x | include/items.php | 5 |
1 files changed, 5 insertions, 0 deletions
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']); |