From: Michael <heluecht@pirati.ca>
Date: Tue, 10 Sep 2019 04:29:49 +0000 (+0000)
Subject: Issue 7603: Display forums too when they are AP
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e588c350ef60e38dabeeadab24d1a9f79294e8d6;p=friendica.git

Issue 7603: Display forums too when they are AP
---

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 9ea8cc449e..1b29273164 100644
--- 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);