diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
| commit | 2aad4c2cf9c17a7532089aadfcc5feff6505ec74 (patch) | |
| tree | 2082c8dc7ba090f610874b6e33b0f1092a2ff00c /include/conversation.php | |
| parent | 474a1267d73c1dcf00678dd15ed4e0e37496473d (diff) | |
| parent | e2692a4baaf031bd0d9c0893c3762637b1f6b201 (diff) | |
| download | volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.gz volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.bz2 volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.zip | |
Merge pull request #4 from redmatrix/master
Merge master into dev branch
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2c447acbc..747bb5d0a 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'], @@ -1226,7 +1227,7 @@ function status_editor($a, $x, $popup = false) { '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), - '$ptyp' => (($notes_cid) ? 'note' : 'wall'), + '$ptyp' => '', '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => '', |