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

We now use the new account-user-view (and fixed the function name)

Browse source
This commit is contained in:
Michael 2021-07-11 09:39:34 +00:00
parent 780d9f1793
commit d267ba999c
17 changed files with 97 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Contact.php
View file

@ -283,7 +283,7 @@ class Contact extends BaseModule
$contact_id = intval($a->argv[1]);
// Ensure to use the user contact when the public contact was provided
$data = Model\Contact::getPublicAndUserContacID($contact_id, local_user());
$data = Model\Contact::getPublicAndUserContactID($contact_id, local_user());
if (!empty($data['user']) && ($contact_id == $data['public'])) {
$contact_id = $data['user'];
}
@ -915,7 +915,7 @@ class Contact extends BaseModule
public static function getTabsHTML(array $contact, int $active_tab)
{
$cid = $pcid = $contact['id'];
$data = Model\Contact::getPublicAndUserContacID($contact['id'], local_user());
$data = Model\Contact::getPublicAndUserContactID($contact['id'], local_user());
if (!empty($data['user']) && ($contact['id'] == $data['public'])) {
$cid = $data['user'];
} elseif (!empty($data['public'])) {