diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-29 19:34:23 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-29 19:34:23 -0800 |
| commit | 91bb4bdf508ab87951a3e01ac3632cffc7bff07d (patch) | |
| tree | cbe4dc7b0e4641ea677c159cb6871adf0b40f6db /include/photos.php | |
| parent | be2b7c0b5f7f9b8080affbb4bc44c5adda18e82f (diff) | |
| parent | 2d45f9f385a5738d2126f66c0e5467533e6838c2 (diff) | |
| download | volse-hubzilla-91bb4bdf508ab87951a3e01ac3632cffc7bff07d.tar.gz volse-hubzilla-91bb4bdf508ab87951a3e01ac3632cffc7bff07d.tar.bz2 volse-hubzilla-91bb4bdf508ab87951a3e01ac3632cffc7bff07d.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/photos.php b/include/photos.php index be18600de..5dd5f3c62 100644 --- a/include/photos.php +++ b/include/photos.php @@ -300,7 +300,7 @@ function photo_upload($channel, $observer, $args) { $activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link); - $summary = $activity_format . "\n\n" . (($args['body']) ? $args['body'] . "\n\n" : ''); + $summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]'; $obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' @@ -391,8 +391,8 @@ function photo_upload($channel, $observer, $args) { $arr['deny_cid'] = $ac['deny_cid']; $arr['deny_gid'] = $ac['deny_gid']; $arr['verb'] = ACTIVITY_POST; - $arr['obj_type'] = ACTIVITY_OBJ_PHOTO; - $arr['object'] = json_encode($object); + $arr['obj_type'] = ACTIVITY_OBJ_PHOTO; + $arr['object'] = json_encode($object); $arr['tgt_type'] = ACTIVITY_OBJ_ALBUM; $arr['target'] = json_encode($target); $arr['item_wall'] = 1; @@ -400,7 +400,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'] = $summary; + $arr['body'] = $summary; // this one is tricky because the item and the photo have the same permissions, those of the photo. |