From dcf7946673fd57325fc848df8f8cea7a84cc35b6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 14 Dec 2015 02:34:18 -0800 Subject: revert include/photos.php:L380 --- include/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/photos.php b/include/photos.php index 798b89b54..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'] = (($args['body']) ? $body . "\r\n" . $args['body'] : $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. -- cgit v1.2.3