X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=f328453e9b52f3df5a2e657f91a2cb21b97b2b5b;hb=3d64c3031bd79ed9162774f945ffe169954c4785;hp=a5ea6c4cb6e029e1bf299ebd5537f77757848a5a;hpb=722aada460aa023212b7d97932fe338fe54861a8;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index a5ea6c4cb6..f328453e9b 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -1,6 +1,6 @@ getQueryString(), Logger::DEBUG); @@ -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 = $profile['self'] ?? false; + $local_user_is_self = self::getMyURL() && ($profile['url'] == self::getMyURL()); $visitor_is_authenticated = (bool)self::getMyURL(); $visitor_is_following = in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]) @@ -322,9 +322,9 @@ class Profile } } elseif ($profile_is_native) { if ($visitor_is_following) { - $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url); + $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1'; } else { - $follow_link = $visitor_base_path .'/follow?url=' . urlencode($profile_url); + $follow_link = $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1'; } } @@ -406,6 +406,7 @@ class Profile 'pending' => false, 'hidden' => false, 'archive' => false, + 'failed' => false, 'network' => Protocol::FEDERATED, ]); } @@ -538,7 +539,7 @@ class Profile $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); - $rr['link'] = Contact::magicLink($rr['url']); + $rr['link'] = Contact::magicLinkById($rr['cid']); $rr['title'] = $rr['name']; $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : ''); $rr['startime'] = null; @@ -591,7 +592,7 @@ class Profile $condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(), 'vid' => [Verb::getID(Activity::ATTEND), Verb::getID(Activity::ATTENDMAYBE)], 'visible' => true, 'deleted' => false]; - if (!Item::exists($condition)) { + if (!Post::exists($condition)) { continue; }