Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 21:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into user-contact

Browse source
This commit is contained in:
Michael 2021-09-25 18:34:55 +00:00
commit 3fddf3807a
12 changed files with 157 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Profile.php
View file

@ -406,7 +406,7 @@ class Profile
}
if (!$block && $show_contacts) {
$contact_block = ContactBlock::getHTML($profile);
$contact_block = ContactBlock::getHTML($profile, local_user());
if (is_array($profile) && !$profile['hide-friends']) {
$contact_count = DBA::count('contact', [