diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-14 02:34:18 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-14 02:34:18 -0800 |
| commit | dcf7946673fd57325fc848df8f8cea7a84cc35b6 (patch) | |
| tree | cc654a56b59e26a7bc6a372a609226b9f5c7ef01 | |
| parent | fdd2da905a27fab838aa34ef7baf0ee2c5c3c5f7 (diff) | |
| download | volse-hubzilla-dcf7946673fd57325fc848df8f8cea7a84cc35b6.tar.gz volse-hubzilla-dcf7946673fd57325fc848df8f8cea7a84cc35b6.tar.bz2 volse-hubzilla-dcf7946673fd57325fc848df8f8cea7a84cc35b6.zip | |
revert include/photos.php:L380
| -rw-r--r-- | include/photos.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 2 insertions, 2 deletions
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. diff --git a/version.inc b/version.inc index 45b65f0e2..e71192c92 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-12-13.1245 +2015-12-14.1246 |