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

Merge pull request #5984 from annando/microformats 

Fix webmentions and microformats ("redir" only for logged in users)
This commit is contained in:
Hypolite Petovan 2018-10-21 17:05:00 -04:00 committed by GitHub
parent ac19a9cddc 9b387a226c
commit 6324d4595f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/conversation.php
View File

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

8
src/Object/Post.php
View File

@ -209,7 +209,13 @@ class Post extends BaseObject
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
$profile_link = Contact::magicLinkbyContact($author);
if (local_user()) {
$profile_link = Contact::magicLinkbyContact($author);
} else {
$profile_link = $item['author-link'];
}
if (strpos($profile_link, 'redir/') === 0) {
$sparkle = ' sparkle';
}