]> git.mxchange.org Git - friendica.git/commitdiff
Respect "manually-improve" during contact request
authorMichael <heluecht@pirati.ca>
Sat, 2 Nov 2019 16:24:54 +0000 (16:24 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 2 Nov 2019 16:24:54 +0000 (16:24 +0000)
src/Model/Contact.php

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