Merge pull request #5907 from nupplaphil/goaway_to_redirectto

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index ffe11363f573f0006043a7716f899386ef4045f2..8f630409ff5da42e6aad7d8f228adbe52aea6637 100644 (file)
--- 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'];
                                }