Merge pull request #12409 from annando/diaspora-reshare

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index dcd39a30c1cf2b243bace5a5fa880a26a2546e8c..a1690648fc9e9475d29a706373db9e0f59a0496d 100644 (file)
--- 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['poll'],
+                       '$subscribe_feed_link' => $profile['hidewall'] ?? 0 ? '' : $profile['poll'],
                        '$wallmessage' => DI::l10n()->t('Message'),
                        '$wallmessage_link' => $wallmessage_link,
                        '$account_type' => $account_type,