Merge pull request #6568 from annando/ap-mentions

Links of mentioned contacts hadn't looked great on Mastodon
This commit is contained in:
Hypolite Petovan 2019-01-30 19:05:00 -05:00 committed by GitHub
commit 811bafa246
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1293,7 +1293,7 @@ class BBCode extends BaseObject
$text); $text);
} elseif ($simple_html == 7) { } elseif ($simple_html == 7) {
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>', '$1<span class="vcard"><a href="$2" class="url u-url mention" title="$3"><span class="fn nickname mention">$3</span></a></span>',
$text); $text);
} elseif (!$simple_html) { } elseif (!$simple_html) {
$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",