bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

The follow confirmation process is now separated between DFRN and the rest

Browse source
This commit is contained in:
Michael 2019-05-06 05:46:13 +00:00
commit 5da3e17a12
6 changed files with 259 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mod/notifications.php
View file

@ -223,6 +223,14 @@ function notifications_content(App $a)
'$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
]);
$contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]);
if (($contact['network'] != Protocol::DFRN) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) {
$action = 'follow_confirm';
} else {
$action = 'dfrn_confirm';
}
$header = $notif['name'];
if ($notif['addr'] != '') {
@ -270,6 +278,7 @@ function notifications_content(App $a)
'$note' => $notif['note'],
'$ignore' => L10n::t('Ignore'),
'$discard' => $discard,
'$action' => $action,
]);
break;
}