Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 19:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for bad invocations of HTML::toBBCode() (1st parameter is now string)

Browse source
This commit is contained in:
Roland Häder 2022-06-16 14:21:11 +02:00
parent b200874f17
commit 7814ba4fc4
No known key found for this signature in database
GPG key ID: C82EDE5DDFA0BA77
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/ActivityPub/Processor.php
View file

@ -651,7 +651,7 @@ class Processor
$content = self::removeImplicitMentionsFromBody($content, $parent); $content = self::removeImplicitMentionsFromBody($content, $parent);
} }
$item['content-warning'] = HTML::toBBCode($activity['summary']); $item['content-warning'] = (!empty($activity['summary']) ? HTML::toBBCode($activity['summary']) : '');
$item['raw-body'] = $item['body'] = $content; $item['raw-body'] = $item['body'] = $content;
} }
@ -1225,7 +1225,8 @@ class Processor
$attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id'); $attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id');
$authorid = Contact::getIdForURL($attributed_to); $authorid = Contact::getIdForURL($attributed_to);
$body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value')); $value = JsonLD::fetchElement($activity['as:object'], 'as:content', '@value');
$body = (!empty($value) ? HTML::toBBCode($value) : '');
$messageTags = []; $messageTags = [];
$tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []); $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);