keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaning confirm

Browse source
This commit is contained in:
Michael Vogel 2019-05-03 06:17:26 +02:00
parent 949fd1e8bf
commit 6c34196264
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/dfrn_confirm.php
View file

@ -24,7 +24,6 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\APContact;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\User; use Friendica\Model\User;
@ -145,11 +144,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
} }
// an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact // an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact
if (($network === Protocol::DFRN) && empty($dfrn_id) && !empty($contact['hub-verify'])) { if (($network === Protocol::DFRN) && empty($dfrn_id)) {
$apcontact = APContact::getByURL($contact['url']); $network = Contact::getProtocol($contact['url'], $contact['network']);
if (!empty($apcontact)) {
$network = Protocol::ACTIVITYPUB;
}
} }
if ($network === Protocol::DFRN) { if ($network === Protocol::DFRN) {