diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
| commit | 3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af (patch) | |
| tree | 84b87fb47a27035afd2a354d11c36e8259f4c18e /include/photos.php | |
| parent | 565126a888d70dce853a2351b698bbc0695f0ba9 (diff) | |
| parent | dcf7946673fd57325fc848df8f8cea7a84cc35b6 (diff) | |
| download | volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.gz volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.bz2 volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php index c7360a956..15aa8ee17 100644 --- a/include/photos.php +++ b/include/photos.php @@ -377,7 +377,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 . "\r\n" . $args['body']); + $arr['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']); // this one is tricky because the item and the photo have the same permissions, those of the photo. |