bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5986 from annando/improve-5984

Browse source 
Improve PR 5984: better check for remote users as well
This commit is contained in:
rabuzarus 2018-10-22 00:03:19 +02:00 committed by GitHub
commit 72a7671010
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/conversation.php
View file

@ -354,7 +354,7 @@ function localize_item(&$item)
'network' => $item['author-network'], 'url' => $item['author-link']]; 'network' => $item['author-network'], 'url' => $item['author-link']];
// Only create a redirection to a magic link when logged in // Only create a redirection to a magic link when logged in
if (!empty($item['plink']) && local_user()) { if (!empty($item['plink']) && (local_user() || remote_user())) {
$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']); $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
} }
} }

2
src/Object/Post.php
View file

@ -210,7 +210,7 @@ class Post extends BaseObject
$author = ['uid' => 0, 'id' => $item['author-id'], $author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']]; 'network' => $item['author-network'], 'url' => $item['author-link']];
if (local_user()) { if (local_user() || remote_user()) {
$profile_link = Contact::magicLinkbyContact($author); $profile_link = Contact::magicLinkbyContact($author);
} else { } else {
$profile_link = $item['author-link']; $profile_link = $item['author-link'];