From 0155e9131d257b5c80749739708c69ae7d96eb6d Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 11 May 2023 12:51:25 +0000 Subject: remove outdated comments --- Zotlabs/Lib/Activity.php | 5 ++--- 1 file changed, 2 insertions(+), 3 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; } -- cgit v1.2.3 From 9252ae159675877e0a8a31a43004ce34a801b617 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 12 May 2023 08:01:25 +0000 Subject: css fixes --- view/tpl/profile_vcard.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}}
-
- {{$profile.fullname}} +
+ {{$profile.fullname}}
{{if $profile.pdesc}}
{{$profile.pdesc}}
-- cgit v1.2.3