diff options
| author | Max Kostikov <max@kostikov.co> | 2019-06-18 11:47:26 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-06-18 11:47:26 +0200 |
| commit | e2abc0b7277956651d2947c34a0522a77a59a9a5 (patch) | |
| tree | 95e9c8863d20b7c91a6d07297cacd2ef8cf32818 /Zotlabs/Lib/Activity.php | |
| parent | 43cec4398d0d035dd9446988134b814513a73080 (diff) | |
| parent | a677a68ab7e1f50f5b11c02a42dbc6cad3ebb444 (diff) | |
| download | volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.tar.gz volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.tar.bz2 volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.zip | |
Merge branch 'dev' into 'dev'
Dev
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index bc86ae0e0..0808fe33f 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -151,7 +151,6 @@ class Activity { static function fetch_image($x) { - $ret = [ 'type' => 'Image', 'id' => $x['id'], @@ -1570,7 +1569,7 @@ class Activity { $s['verb'] = self::activity_decode_mapper($act->type); - if($act->type === 'Tombstone' || $act-type === 'Delete' || ($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; } @@ -2253,4 +2252,4 @@ class Activity { } -}
\ No newline at end of file +} |