diff options
| author | nobody <nobody@zotlabs.com> | 2021-06-03 16:01:16 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-06-03 16:01:16 -0700 |
| commit | 686530c1873f98d724355bf3f456243b1b7fdadd (patch) | |
| tree | 81fdbb61a8ef8f73dc3a5009e8a2f6c5a75de712 /Zotlabs/Lib | |
| parent | 462980c70a2698490d97a481cee0f2500dacb91c (diff) | |
| parent | ba22d3e9b6ef7042d7129c7715c81c668fcf79b3 (diff) | |
| download | volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.tar.gz volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.tar.bz2 volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index a5fb4a756..2324a8136 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -304,11 +304,12 @@ 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 join hubloc on xchan_hash = hubloc_hash where hubloc_network in ('zot6', 'activitypub') and hubloc_id_url = '%s'", + $r = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s'", dbesc($x) ); if ($r) { - $y = Activity::encode_person($r[0]); + $r = Libzot::zot_record_preferred($r); + $y = Activity::encode_person($r); $y['cached'] = true; return $y; } |