aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/ActivityStreams.php
diff options
context:
space:
mode:
authornobody <nobody@zotlabs.com>2021-05-31 14:36:14 -0700
committernobody <nobody@zotlabs.com>2021-05-31 14:36:14 -0700
commit462980c70a2698490d97a481cee0f2500dacb91c (patch)
tree4935db45ad6fbe37cd0af3b93bbb20ecb656c752 /Zotlabs/Lib/ActivityStreams.php
parenta96345401f47be71a6eef531e204c0e25b792a16 (diff)
parent217168628421f4e394b9b85e33d2d653d8b5b3d6 (diff)
downloadvolse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.tar.gz
volse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.tar.bz2
volse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/ActivityStreams.php')
-rw-r--r--Zotlabs/Lib/ActivityStreams.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index ba7ec0c65..a5fb4a756 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -304,7 +304,7 @@ class ActivityStreams {
// SECURITY: If we have already stored the actor profile, re-generate it
// from cached data - don't refetch it from the network
- $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1",
+ $r = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where hubloc_network in ('zot6', 'activitypub') and hubloc_id_url = '%s'",
dbesc($x)
);
if ($r) {