aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2024-01-19 11:02:13 +0100
committerMario <mario@mariovavti.com>2024-01-19 10:03:58 +0000
commitaba80021709df04bfa6e03a80802d0cd1c368a80 (patch)
treeafc92b4084cf55d8ed024a8c8541c6ba9001d691
parent0bdffc4a2d9cdd2892cc736d9433853597d2fc32 (diff)
downloadvolse-hubzilla-aba80021709df04bfa6e03a80802d0cd1c368a80.tar.gz
volse-hubzilla-aba80021709df04bfa6e03a80802d0cd1c368a80.tar.bz2
volse-hubzilla-aba80021709df04bfa6e03a80802d0cd1c368a80.zip
Fix regression in Activity::actor_store()
(cherry picked from commit 9cc85adf4734aec5bdaf7057b5885849a40c4340)
-rw-r--r--CHANGELOG4
-rw-r--r--Zotlabs/Lib/Activity.php16
2 files changed, 10 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e35223071..ca7bb5f07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Hubzilla 8.8.7 (2024-01-19)
+ - Fix regression in Activity::actor_store()
+
+
Hubzilla 8.8.6 (2024-01-11)
- Provide more builtin jsonld files
- Development branch compatibility in Libsync
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 835909849..4fbc051bf 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1626,11 +1626,15 @@ class Activity {
}
*/
- $url = null;
- $ap_hubloc = null;
+ $url = $person_obj['id'] ?? '';
+
+ if (!$url) {
+ return;
+ }
$hublocs = self::get_actor_hublocs($url);
$has_zot_hubloc = false;
+ $ap_hubloc = null;
if ($hublocs) {
foreach ($hublocs as $hub) {
@@ -1654,14 +1658,6 @@ class Activity {
}
}
- if (isset($person_obj['id'])) {
- $url = $person_obj['id'];
- }
-
- if (!$url) {
- return;
- }
-
$inbox = $person_obj['inbox'] ?? null;
// invalid AP identity