diff options
| author | Mario <mario@mariovavti.com> | 2021-06-02 07:44:36 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-06-02 07:44:36 +0000 |
| commit | 25be24e6b834a8236d0d8973347058d42d0f117d (patch) | |
| tree | e884ce8f3c376f4426487da350eafbac6b084d50 | |
| parent | b0825ead84718d98bbed39d0e1ee527f114b20a6 (diff) | |
| parent | 2ec2da5dff1f8be28c6f625a37295a9410d35593 (diff) | |
| download | volse-hubzilla-25be24e6b834a8236d0d8973347058d42d0f117d.tar.gz volse-hubzilla-25be24e6b834a8236d0d8973347058d42d0f117d.tar.bz2 volse-hubzilla-25be24e6b834a8236d0d8973347058d42d0f117d.zip | |
Merge branch 'six' of https://framagit.org/hubzilla/core into six
| -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; } |