diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-06-02 09:41:57 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-06-02 07:52:40 +0000 |
| commit | b63aa3079b624ab6bb526ec233aecb7c3f2d4061 (patch) | |
| tree | ae14aadbe0da44cdefc6f1d68404dcb7d57db5fa | |
| parent | 217168628421f4e394b9b85e33d2d653d8b5b3d6 (diff) | |
| download | volse-hubzilla-b63aa3079b624ab6bb526ec233aecb7c3f2d4061.tar.gz volse-hubzilla-b63aa3079b624ab6bb526ec233aecb7c3f2d4061.tar.bz2 volse-hubzilla-b63aa3079b624ab6bb526ec233aecb7c3f2d4061.zip | |
fix regression where authors from non zot6, activitypub networks got dismissed (e.g. relayed diaspora comments)
(cherry picked from commit b3df15a3c6e017ce3858ee484c6d2d70a5f18a17)
| -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; } |