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

Merge pull request #7923 from annando/issue-7418

Browse source 
Issue 7418: connections to forums should now work again
This commit is contained in:
Hypolite Petovan 2019-12-09 16:53:48 -05:00 committed by GitHub
parent a4cc22e8fb 49767e0555
commit 010a7b7576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Contact.php
View file

@ -2332,7 +2332,7 @@ class Contact extends BaseObject
$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'];
} }
} }
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {

2
src/Worker/OnePoll.php
View file

@ -41,7 +41,7 @@ class OnePoll
} }
if ($force) { if ($force) {
Contact::updateFromProbe($contact_id, true); Contact::updateFromProbe($contact_id, '', true);
} }
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);