X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=a1690648fc9e9475d29a706373db9e0f59a0496d;hb=9a8f6f2150d64cd9ebcbde7c73f8554b096426db;hp=2496199bd15439a5819276c6696a25fcecbed765;hpb=9561910e832d45a5b8fbbca16b976f47cd0206a6;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 2496199bd1..a1690648fc 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -335,13 +335,13 @@ class Profile if (!$visitor_is_authenticated) { // Remote follow is only available for local profiles if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) { - $follow_link = 'remote_follow/' . $profile['nickname']; + $follow_link = 'profile/' . $profile['nickname'] . '/remote_follow'; } } else { if ($visitor_is_following) { - $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1'; + $unfollow_link = $visitor_base_path . '/contact/unfollow?url=' . urlencode($profile_url) . '&auto=1'; } else { - $follow_link = $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1'; + $follow_link = $visitor_base_path . '/contact/follow?url=' . urlencode($profile_url) . '&auto=1'; } } @@ -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,12 +465,13 @@ 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, '$location' => $location, '$homepage' => $homepage, + '$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'), '$about' => $about, '$network' => DI::l10n()->t('Network:'), '$contacts' => $contact_count,