]> git.mxchange.org Git - friendica.git/commitdiff
Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML
authorHypolite Petovan <hypolite@mrpetovan.com>
Fri, 2 Dec 2022 13:14:35 +0000 (08:14 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Fri, 2 Dec 2022 13:17:06 +0000 (08:17 -0500)
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
- Add logging to troubleshoot unexpected case

src/Model/Profile.php

index 26395cb4d123ea3101900c2c2366df436a5aa823..a1690648fc9e9475d29a706373db9e0f59a0496d 100644 (file)
@@ -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,