diff options
| author | Max Kostikov <max@kostikov.co> | 2019-11-25 22:20:49 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-11-25 22:20:49 +0100 |
| commit | 78197aa6258891a11bc9784a19b21541d94954be (patch) | |
| tree | d438d0d15f23c44d213857c07521a2d9cfcc5b7a /include/conversation.php | |
| parent | 9e4ff8ce2584724fe5b54ed284d70d019625e7fa (diff) | |
| parent | fcb065bcb2f8e61d1d9e804f8f251967732ee037 (diff) | |
| download | volse-hubzilla-78197aa6258891a11bc9784a19b21541d94954be.tar.gz volse-hubzilla-78197aa6258891a11bc9784a19b21541d94954be.tar.bz2 volse-hubzilla-78197aa6258891a11bc9784a19b21541d94954be.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!6
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index e2dd02ffc..95eb1daad 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1172,6 +1172,9 @@ function builtin_activity_puller($item, &$conv_responses) { if(! $item['thr_parent']) $item['thr_parent'] = $item['parent_mid']; + + $conv_responses[$mode]['mids'][$item['thr_parent']][] = 'b64.' . base64url_encode($item['mid']); + if(! ((isset($conv_responses[$mode][$item['thr_parent'] . '-l'])) && (is_array($conv_responses[$mode][$item['thr_parent'] . '-l'])))) $conv_responses[$mode][$item['thr_parent'] . '-l'] = array(); |