aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-06-12 10:00:17 +0200
committerMario <mario@mariovavti.com>2019-06-12 10:00:17 +0200
commit9b2cd69c0f0b1a57984d4d0e75a77a8f9e8c99a4 (patch)
treeb0c259a58784f1965addb7aaeaa3f1cef645b54d /Zotlabs
parent907777eeb0049ead4b7497f6f73f1ac68e46b739 (diff)
parentb3f1a19db685e7c84098dcb47d378fdaf2a040f1 (diff)
downloadvolse-hubzilla-9b2cd69c0f0b1a57984d4d0e75a77a8f9e8c99a4.tar.gz
volse-hubzilla-9b2cd69c0f0b1a57984d4d0e75a77a8f9e8c99a4.tar.bz2
volse-hubzilla-9b2cd69c0f0b1a57984d4d0e75a77a8f9e8c99a4.zip
Merge branch 'dev' into 'dev'
attach sync issues See merge request hubzilla/core!1668
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 4a1171c5d..bc86ae0e0 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1570,7 +1570,7 @@ class Activity {
$s['verb'] = self::activity_decode_mapper($act->type);
- if($act->type === 'Tombstone' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
+ if($act->type === 'Tombstone' || $act-type === 'Delete' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
$s['item_deleted'] = 1;
}