Issue 7603: Display forums too when they are AP

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 9ea8cc449ece517619d677a731a35d22e3d4d150..1b292731647956d463d04c834b594455987cd6fa 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -43,7 +43,7 @@ class ForumManager
                        $params = ['order' => ['name']];
                }
 
-               $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
+               $condition_str = "`network` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
 
                if ($showprivate) {
                        $condition_str .= '(`forum` OR `prv`)';
@@ -58,7 +58,7 @@ class ForumManager
                $forumlist = [];
 
                $fields = ['id', 'url', 'name', 'micro', 'thumb'];
-               $condition = [$condition_str, Protocol::DFRN, $uid];
+               $condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
                $contacts = DBA::select('contact', $fields, $condition, $params);
                if (!$contacts) {
                        return($forumlist);