diff options
author | Mario <mario@mariovavti.com> | 2021-09-06 19:22:39 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-09-06 19:22:39 +0000 |
commit | c1ce211b566a68b02f1197ef1bd0fc79385c1c48 (patch) | |
tree | 81d8b40691e73abcb5e988cd42d11d6a1e396c60 /Zotlabs/Lib/ActivityStreams.php | |
parent | 3d40ea7f4417a1134dc53cc2e804af13370cd57b (diff) | |
parent | 1aa782633184f41733778ce75139f0d9a890e1e3 (diff) | |
download | volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.gz volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.bz2 volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.zip |
Merge branch 'dev' into 6.2RC
Diffstat (limited to 'Zotlabs/Lib/ActivityStreams.php')
-rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 2324a8136..fa38c569e 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -300,17 +300,8 @@ class ActivityStreams { function get_actor($property, $base = '', $namespace = '') { $x = $this->get_property_obj($property, $base, $namespace); if ($this->is_url($x)) { - - // 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_id_url = '%s'", - dbesc($x) - ); - if ($r) { - $r = Libzot::zot_record_preferred($r); - $y = Activity::encode_person($r); - $y['cached'] = true; + $y = Activity::get_cached_actor($x); + if ($y) { return $y; } } |