Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

This commit is contained in:
Michael 2021-11-30 05:48:03 +00:00
commit 7dd757b7f9
25 changed files with 690 additions and 371 deletions

View file

@ -208,7 +208,7 @@ class Profile extends BaseModule
$groups_widget = '';
if (!in_array($localRelationship->rel, [Contact::NOTHING, Contact::SELF])) {
$groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact['id']);
$groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $data['user']);
}
$this->page['aside'] .= $vcard_widget . $groups_widget;