clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent b65247a251 a6de1a1ae8
commit 88a9e4a904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/item.php
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;
@ -548,15 +550,15 @@ function item_post(App $a) {
$objecttype = ACTIVITY_OBJ_IMAGE; $objecttype = ACTIVITY_OBJ_IMAGE;
foreach ($images as $image) { foreach ($images as $image) {
if (! stristr($image,System::baseUrl() . '/photo/')) { if (!stristr($image, System::baseUrl() . '/photo/')) {
continue; continue;
} }
$image_uri = substr($image,strrpos($image,'/') + 1); $image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
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",
@ -577,7 +579,7 @@ function item_post(App $a) {
dbesc($str_group_deny), dbesc($str_group_deny),
dbesc($image_uri), dbesc($image_uri),
intval($profile_uid), intval($profile_uid),
dbesc( t('Wall Photos')) dbesc(t('Wall Photos'))
); );
} }
} }