harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert include/photos.php:L380

Browse Source
This commit is contained in:
redmatrix 2015-12-14 02:34:18 -08:00
parent fdd2da905a
commit dcf7946673
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/photos.php
View File

@ -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.

2
version.inc
View File

@ -1 +1 @@
2015-12-13.1245
2015-12-14.1246