Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 22:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into parent-view

Browse source
This commit is contained in:
Michael 2023-05-29 06:53:02 +00:00
commit 1129e8f17d
147 changed files with 1736 additions and 1725 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Contact/Profile.php
View file

@ -37,7 +37,7 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Circle;
use Friendica\Module;
use Friendica\Module\Response;
use Friendica\Network\HTTPException;
@ -222,13 +222,13 @@ class Profile extends BaseModule
}
$vcard_widget = Widget\VCard::getHTML($contact);
$groups_widget = '';
$circles_widget = '';
if (!in_array($localRelationship->rel, [Contact::NOTHING, Contact::SELF])) {
$groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $data['user']);
$circles_widget = Circle::sidebarWidget('contact', 'circle', 'full', 'everyone', $data['user']);
}
$this->page['aside'] .= $vcard_widget . $groups_widget;
$this->page['aside'] .= $vcard_widget . $circles_widget;
$o = '';
Nav::setSelected('contact');