Merge pull request #3969 from annando/bugfix-picture-forum

Posting images to public forums now really does work.
This commit is contained in:
Hypolite Petovan 2017-11-26 17:47:14 -05:00 committed by GitHub
commit 88a9e4a904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -512,6 +512,8 @@ function item_post(App $a) {
} }
} }
$original_contact_id = $contact_id;
if (!$parent && count($forum_contact) && ($private_forum || $only_to_forum)) { if (!$parent && count($forum_contact) && ($private_forum || $only_to_forum)) {
// we tagged a forum in a top level post. Now we change the post // we tagged a forum in a top level post. Now we change the post
$private = $private_forum; $private = $private_forum;
@ -556,7 +558,7 @@ function item_post(App $a) {
if (!strlen($image_uri)) { if (!strlen($image_uri)) {
continue; continue;
} }
$srch = '<' . intval($contact_id) . '>'; $srch = '<' . intval($original_contact_id) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",