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

Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions 

fix magic links for item mentions
This commit is contained in:
Hypolite Petovan 2019-02-17 21:24:01 -05:00 committed by GitHub
parent bc48274c40 c59ba94648
commit 74edf9994f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Term.php
View File

@ -272,10 +272,10 @@ class Term
$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']];
$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
$prefix = ''; $prefix = '';
if ($tag['type'] == TERM_HASHTAG) { if ($tag['type'] == TERM_HASHTAG) {
$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
if ($orig_tag != $tag['url']) { if ($orig_tag != $tag['url']) {
$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']); $item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
} }
@ -283,6 +283,7 @@ class Term
$return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>'; $return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
$prefix = '#'; $prefix = '#';
} elseif ($tag['type'] == TERM_MENTION) { } elseif ($tag['type'] == TERM_MENTION) {
$tag['url'] = Contact::magicLink($tag['url']);
$return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>'; $return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
$prefix = '@'; $prefix = '@';
} }