diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-11-26 11:38:07 -0800 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-26 11:38:07 -0800 |
commit | 5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987 (patch) | |
tree | 36f9f4b1e29d7a7d5212ebe19bf53b89d3e94da5 /include/conversation.php | |
parent | 0cf9e498b963f2f8b5717d1eae8de183dd98d8d6 (diff) | |
parent | c407e72dcc4d4f892e88e8260e662104586695f2 (diff) | |
download | volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.tar.gz volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.tar.bz2 volse-hubzilla-5ec5b127d0b1e8a5d4b6e2d87f6a318aac17f987.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2c447acbc..3b534dc69 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -697,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'thumb' => $profile_avatar, 'title' => $item['title'], 'body' => $body['html'], + 'event' => $body['event'], 'photo' => $body['photo'], 'tags' => $body['tags'], 'categories' => $body['categories'], |