Merge remote-tracking branch 'upstream/develop' into api-alt-description

This commit is contained in:
Michael 2019-07-30 13:40:12 +00:00
commit f8b8a5a52b

View file

@ -415,9 +415,7 @@ class Processor
if ($isForum) { if ($isForum) {
$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver, true); $item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver, true);
} } else {
if (empty($item['contact-id'])) {
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true); $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
} }