diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-16 15:41:43 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-16 15:41:43 -0700 |
| commit | 507d04a98772ca73d9d1c1b4fb324159cff1d8ae (patch) | |
| tree | c506762303a8f5940b3d443b6675a7a3c9fa8c68 /include/conversation.php | |
| parent | f09df061303f2f237865441a8d1dde133b33f5f2 (diff) | |
| parent | 10cc643f650b5ff0954ff988fbf768ea5e061571 (diff) | |
| download | volse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.tar.gz volse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.tar.bz2 volse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.zip | |
Merge https://github.com/redmatrix/redmatrix 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 05898cfce..cdb7807b6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1208,6 +1208,7 @@ function status_editor($a, $x, $popup = false) { '$shortpermset' => t('permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), + '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => '', '$baseurl' => $a->get_baseurl(true), '$defloc' => $x['default_location'], |