Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 23:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new-participation

Browse source
This commit is contained in:
Michael 2020-05-05 12:48:33 +00:00
commit 2f42e68dc8
40 changed files with 5025 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Protocol/OStatus.php
View file

@ -2081,11 +2081,9 @@ class OStatus
XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
}
$tags = Tag::getByURIId($item['uri-id']);
if (count($tags)) {
foreach ($tags as $tag) {
$mentioned[$tag['url']] = $tag['url'];
}
// uri-id isn't present for follow entry pseudo-items
foreach (Tag::getByURIId($item['uri-id'] ?? 0) as $tag) {
$mentioned[$tag['url']] = $tag['url'];
}
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)