aboutsummaryrefslogtreecommitdiffstats
path: root/include/photos.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/photos.php')
-rw-r--r--include/photos.php4
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'];