From 8fc8e26e23fee2e083efc5568794312f6c481369 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 9 Sep 2019 21:37:26 +0000 Subject: [PATCH] Replace not working "redir" link with a working one --- include/text.php | 2 +- src/Model/Photo.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 3d6bf6a563..2050e57026 100644 --- a/include/text.php +++ b/include/text.php @@ -122,7 +122,7 @@ function redir_private_images($a, &$item) } if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == Protocol::DFRN)) { - $img_url = 'redir?f=1&quiet=1&url=' . urlencode($mtch[1]) . '&conurl=' . urlencode($item['author-link']); + $img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]); $item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']); } } diff --git a/src/Model/Photo.php b/src/Model/Photo.php index e722444b18..11721c81fd 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -656,6 +656,8 @@ class Photo extends BaseObject continue; } + /// @todo Check if $str_contact_allow does contain a public forum. Then set the permissions to public. + $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny]; $condition = ['resource-id' => $image_uri, 'uid' => $uid];