friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-09 01:00:16 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Simplifications

Browse source
This commit is contained in:
Michael 2020-09-02 07:14:01 +00:00
parent 8402450101
commit 04b6f00ca9
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -1850,13 +1850,11 @@ class Contact
$ret['forum'] = false; $ret['forum'] = false;
$ret['prv'] = false; $ret['prv'] = false;
$ret['contact-type'] = $ret['account-type']; $ret['contact-type'] = $ret['account-type'];
if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) { if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) {
if (isset($ret['manually-approve'])) {
$ret['forum'] = (bool)!$ret['manually-approve']; $ret['forum'] = (bool)!$ret['manually-approve'];
$ret['prv'] = (bool)!$ret['forum']; $ret['prv'] = (bool)!$ret['forum'];
} }
} }
}
$new_pubkey = $ret['pubkey'] ?? ''; $new_pubkey = $ret['pubkey'] ?? '';
@ -2121,11 +2119,9 @@ class Contact
$hidden = (($protocol === Protocol::MAIL) ? 1 : 0); $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
$pending = false; $pending = false;
if ($protocol == Protocol::ACTIVITYPUB) { if (($protocol == Protocol::ACTIVITYPUB) && isset($ret['manually-approve'])) {
if (isset($ret['manually-approve'])) {
$pending = (bool)$ret['manually-approve']; $pending = (bool)$ret['manually-approve'];
} }
}
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1; $writeable = 1;