X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FCore%2FACL.php;h=8f630409ff5da42e6aad7d8f228adbe52aea6637;hb=2a881cc2e71b1677cc9ce98001ae3f157743e542;hp=ffe11363f573f0006043a7716f899386ef4045f2;hpb=1fa37586caa351b3bdb44920649ba0fa90c36bd0;p=friendica.git diff --git a/src/Core/ACL.php b/src/Core/ACL.php index ffe11363f5..8f630409ff 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -51,14 +51,14 @@ class ACL extends BaseObject break; case 'PRIVATE': - $networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; break; case 'TWO_WAY': if (!empty($a->user['prvnets'])) { - $networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; } else { - $networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS]; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS]; } break; @@ -344,9 +344,9 @@ class ACL extends BaseObject $a = self::getApp(); $p = $a->pager['page'] != 1 ? '&p=' . $a->pager['page'] : ''; - $response = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); - if ($response['success']) { - $lsearch = json_decode($response['body'], true); + $curlResult = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); + if ($curlResult->isSuccess()) { + $lsearch = json_decode($curlResult->getBody(), true); if (!empty($lsearch['results'])) { $return = $lsearch['results']; }