aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2023-05-13 21:38:08 +0200
committerMario Vavti <mario@mariovavti.com>2023-05-13 21:38:08 +0200
commit049fc9161541b388910ef83b404c8902734b3df4 (patch)
treed5fd338293e64a969576afa89b32bc8df8b4c245
parent5d330e18ff297c7cf034a195e51918614746a27e (diff)
parentb7c96f2cbd00a00d2e403cd2a68e317d6b1a414e (diff)
downloadvolse-hubzilla-049fc9161541b388910ef83b404c8902734b3df4.tar.gz
volse-hubzilla-049fc9161541b388910ef83b404c8902734b3df4.tar.bz2
volse-hubzilla-049fc9161541b388910ef83b404c8902734b3df4.zip
Merge branch 'dev' into 8.4RC
-rw-r--r--Zotlabs/Lib/Activity.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 903675e1d..bb3695341 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -2226,7 +2226,6 @@ class Activity {
static function decode_note($act) {
$response_activity = false;
-
$s = [];
// These activities should have been handled separately in the Inbox module and should not be turned into posts
@@ -2305,7 +2304,7 @@ class Activity {
$response_activity = true;
$s['mid'] = $act->id;
- $s['uuid'] = ((is_array($act->data) && isset($act->data['diaspora:guid'])) ?: uuid_from_url($s['mid']));
+ $s['uuid'] = (($act->data['diaspora:guid']) ?: uuid_from_url($s['mid']));
$s['parent_mid'] = $act->objprop('id') ?: $act->obj;