diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-24 22:16:08 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-24 22:16:08 +0200 |
| commit | 123fe58c26ed29a6c75357a1ced004c1d4263d04 (patch) | |
| tree | 72b2f606ab616cb91ba5b80b4ee5a5f4ac0f0f2b /include/photos.php | |
| parent | fd1e163bf40b6571f158ef9a87d2847c158949f4 (diff) | |
| download | volse-hubzilla-123fe58c26ed29a6c75357a1ced004c1d4263d04.tar.gz volse-hubzilla-123fe58c26ed29a6c75357a1ced004c1d4263d04.tar.bz2 volse-hubzilla-123fe58c26ed29a6c75357a1ced004c1d4263d04.zip | |
new line between photo and description
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/photos.php b/include/photos.php index d89c0fca1..cd2da735c 100644 --- a/include/photos.php +++ b/include/photos.php @@ -302,7 +302,7 @@ function photo_upload($channel, $observer, $args) { if($item['mid'] === $item['parent_mid']) { - $item['body'] = (($object) ? '' : $body); + $item['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']); $item['obj_type'] = (($object) ? ACTIVITY_OBJ_PHOTO : ''); $item['object'] = (($object) ? json_encode($object) : ''); @@ -365,7 +365,7 @@ function photo_upload($channel, $observer, $args) { $arr['item_thread_top'] = 1; $arr['item_private'] = intval($acl->is_private()); $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid']; - $arr['body'] = (($object) ? $args['body'] : $body . $args['body']); + $arr['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']); $result = item_store($arr); $item_id = $result['item_id']; |