From 98f4a6889097cb2b0f6c6ab1c10290ecca8ff9d8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 2 Dec 2022 08:14:35 -0500 Subject: [PATCH 1/3] Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML - Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938 - Add logging to troubleshoot unexpected case --- src/Model/Profile.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 26395cb4d1..a1690648fc 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -451,6 +451,10 @@ class Profile $p['url'] = Contact::magicLinkById($cid, $profile['url']); + if (!isset($profile['hidewall'])) { + Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]); + } + $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$profile' => $p, @@ -461,7 +465,7 @@ class Profile '$unfollow' => DI::l10n()->t('Unfollow'), '$unfollow_link' => $unfollow_link, '$subscribe_feed' => DI::l10n()->t('Atom feed'), - '$subscribe_feed_link' => $profile['hidewall'] ? '' : $profile['poll'], + '$subscribe_feed_link' => $profile['hidewall'] ?? 0 ? '' : $profile['poll'], '$wallmessage' => DI::l10n()->t('Message'), '$wallmessage_link' => $wallmessage_link, '$account_type' => $account_type, From 8b2a3805b6afa2d6b3e5fd7a2b7b2d7a4787c782 Mon Sep 17 00:00:00 2001 From: Matthias Moritz Date: Fri, 2 Dec 2022 20:42:16 +0100 Subject: [PATCH 2/3] Update Event.php fixing double encoding issue in event view. fixes #12308 --- src/Model/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 5d71dd16af..0bba1f7cd6 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -673,7 +673,7 @@ class Event $event['author-link'] = Contact::magicLink($event['author-link']); $event['summary'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary'])); - $event['desc'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc'])); + $event['desc'] = Strings::escapeHtml($event['desc']); $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location'])); return [ From f27d9cb73e399794dedc8ece1ac3a8a285016f2a Mon Sep 17 00:00:00 2001 From: Matthias Moritz Date: Fri, 2 Dec 2022 20:59:24 +0100 Subject: [PATCH 3/3] Update Event.php --- src/Model/Event.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 0bba1f7cd6..06d391745d 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -672,9 +672,6 @@ class Event } $event['author-link'] = Contact::magicLink($event['author-link']); - $event['summary'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary'])); - $event['desc'] = Strings::escapeHtml($event['desc']); - $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location'])); return [ 'id' => $event['id'],