diff options
| author | Max Kostikov <max@kostikov.co> | 2019-10-06 11:18:35 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-10-06 11:18:35 +0200 |
| commit | a435363b949021b1beeb7cb124668f672bf41ea2 (patch) | |
| tree | 3aebd8ccbd4a9944bc85bf3cc9c3880cb33b4681 | |
| parent | afee2cf71ac36b7ed0ee390c4c595c15af96f5f6 (diff) | |
| parent | d6634eb14e3fd6afdfd8b1f0a74a200a55c2826d (diff) | |
| download | volse-hubzilla-a435363b949021b1beeb7cb124668f672bf41ea2.tar.gz volse-hubzilla-a435363b949021b1beeb7cb124668f672bf41ea2.tar.bz2 volse-hubzilla-a435363b949021b1beeb7cb124668f672bf41ea2.zip | |
Merge branch 'cherry-pick-d8b8d8ce' into 'dev'
fix zap->hubzlla event title compatibility
See merge request hubzilla/core!1749
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index b869c55b5..844127ee3 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1693,11 +1693,12 @@ class Activity { } if($act->obj['type'] === 'Event') { + $s['obj'] = []; $s['obj']['asld'] = $act->obj; $s['obj']['type'] = ACTIVITY_OBJ_EVENT; $s['obj']['id'] = $act->obj['id']; - $s['obj']['title'] = $act->obj['summary']; + $s['obj']['title'] = $act->obj['name']; if(strpos($act->obj['startTime'],'Z')) $s['obj']['adjust'] = true; |