Browse Source

Issue 9229: Show unfollow with known contacts

tags/2020.09
Michael 1 month ago
parent
commit
bf2ca5fcf9
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/Model/Profile.php
  2. +2
    -2
      src/Module/Contact.php

+ 1
- 1
src/Model/Profile.php View File

@@ -304,7 +304,7 @@ class Profile

$profile_is_dfrn = $profile['network'] == Protocol::DFRN;
$profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
$local_user_is_self = local_user() && local_user() == ($profile['uid'] ?? 0);
$local_user_is_self = $profile['self'] ?? false;
$visitor_is_authenticated = (bool)self::getMyURL();
$visitor_is_following =
in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])


+ 2
- 2
src/Module/Contact.php View File

@@ -952,7 +952,7 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';

$profiledata = Model\Contact::getByURL($contact['url'], false);
$profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());

Model\Profile::load($a, '', $profiledata, true);

@@ -975,7 +975,7 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';

$profiledata = Model\Contact::getByURL($contact['url'], false);
$profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());

if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);


Loading…
Cancel
Save