diff options
| author | zotlabs <mike@macgirvin.com> | 2020-02-10 14:38:28 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-02-10 14:38:28 -0800 |
| commit | b767bda4105b141d71b94d4fdd4d6332f775db1a (patch) | |
| tree | 76f4bf2319d35e60701dbe6c272bf08307906a9b /Zotlabs/Lib/Activity.php | |
| parent | be81a40b2b3a0b0c117e2c6571bb38f577859bb8 (diff) | |
| parent | a39d436f9f46138db623ee3c9ddef2c501ea8bd2 (diff) | |
| download | volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.gz volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.bz2 volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 06aa3b931..5a406beb7 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -928,6 +928,7 @@ class Activity { 'http://purl.org/zot/activity/file' => 'zot:File', 'http://purl.org/zot/activity/mood' => 'zot:Mood', 'Invite' => 'Invite', + 'Question' => 'Question' ]; call_hooks('activity_obj_decode_mapper',$objs); @@ -962,7 +963,8 @@ class Activity { 'http://purl.org/zot/activity/thing' => 'Object', 'http://purl.org/zot/activity/file' => 'zot:File', 'http://purl.org/zot/activity/mood' => 'zot:Mood', - 'Invite' => 'Invite', + 'Invite' => 'Invite', + 'Question' => 'Question' ]; call_hooks('activity_obj_mapper',$objs); @@ -1806,6 +1808,8 @@ class Activity { $s['item_deleted'] = 1; } + + $s['obj_type'] = self::activity_obj_decode_mapper($act->obj['type']); if($s['obj_type'] === ACTIVITY_OBJ_NOTE && $s['mid'] !== $s['parent_mid']) { $s['obj_type'] = ACTIVITY_OBJ_COMMENT; @@ -2219,6 +2223,7 @@ class Activity { } } + if ($p[0]['obj_type'] === 'Question') { if ($item['obj_type'] === ACTIVITY_OBJ_NOTE && $item['title'] && (! $item['content'])) { $item['obj_type'] = 'Answer'; |