Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Respect "manually-improve" during contact request

Browse source
This commit is contained in:
Michael 2019-11-02 16:24:54 +00:00
parent e27ebaee48
commit 9461446374
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Model/Contact.php
View file

@ -2298,15 +2298,12 @@ class Contact extends BaseObject
$hidden = (($protocol === Protocol::MAIL) ? 1 : 0); $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
$pending = false;
if ($protocol == Protocol::ACTIVITYPUB) { if ($protocol == Protocol::ACTIVITYPUB) {
$apcontact = APContact::getByURL($url, false); $apcontact = APContact::getByURL($url, false);
if (isset($apcontact['manually-approve'])) { if (isset($apcontact['manually-approve'])) {
$pending = (bool)$apcontact['manually-approve']; $pending = (bool)$apcontact['manually-approve'];
} else {
$pending = true;
} }
} else {
$pending = false;
} }
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {