diff options
| author | Mario <mario@mariovavti.com> | 2023-05-12 08:02:19 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-12 08:02:19 +0000 |
| commit | 07662ff0768216d55098bd966280e05ed2bd340e (patch) | |
| tree | 204c857cf5316b28b9c9e30cc2433976e780fb83 | |
| parent | 247cf40acea393f104d6950ddd732a21ec6ca50a (diff) | |
| parent | 9252ae159675877e0a8a31a43004ce34a801b617 (diff) | |
| download | volse-hubzilla-07662ff0768216d55098bd966280e05ed2bd340e.tar.gz volse-hubzilla-07662ff0768216d55098bd966280e05ed2bd340e.tar.bz2 volse-hubzilla-07662ff0768216d55098bd966280e05ed2bd340e.zip | |
Merge branch 'dev' into 8.4RC
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 5 | ||||
| -rw-r--r-- | view/tpl/profile_vcard.tpl | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 29986e4a5..d18845e91 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -2869,8 +2869,6 @@ class Activity { } $allowed = false; - - // TODO: not implemented $permit_mentions = intval(PConfig::Get($channel['channel_id'], 'system','permit_all_mentions') && i_am_mentioned($channel, $item)); if ($is_child_node) { @@ -2928,6 +2926,7 @@ class Activity { else { $allowed = true; + // reject public stream comments that weren't sent by the conversation owner if ($is_sys_channel && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) { $allowed = false; @@ -2947,7 +2946,7 @@ class Activity { if (perm_is_allowed($channel['channel_id'], ((!empty($item['item_fetched'])) ? $item['author_xchan'] : $observer_hash), 'send_stream') || $is_sys_channel) { $allowed = true; } - // TODO: not implemented + if ($permit_mentions) { $allowed = true; } diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 14c96de67..6cf40bf79 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -36,8 +36,8 @@ {{/if}} </div> <div class="d-flex"> - <div id="profile-photo-wrapper" class="bg-body-secondary rounded rounded-end-0 rounded-top-0" style="min-width: 5rem; min-height: 5rem;"> - <img class="rounded rounded-end-0 rounded-top-0 u-photo" src="{{$profile.thumb}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}" style="width: 5rem; height: 5rem;"> + <div id="profile-photo-wrapper" class="bg-body-secondary rounded rounded-end-0 rounded-top-0 overflow-hidden" style="min-width: 5rem; min-height: 5rem;"> + <img class="u-photo" src="{{$profile.thumb}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}" style="width: 5rem; height: 5rem;"> </div> {{if $profile.pdesc}} <div class="m-2 small text-break">{{$profile.pdesc}}</div> |