Merge pull request #10463 from annando/proxy-security

[friendica.git] / src / Protocol / ActivityPub / Processor.php

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index aba285c1800e941029d0deaaa2449e610e7477d7..f5d8e48dedace989d7bf41da35d33066ec1be3c3 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -126,6 +126,7 @@ class Processor
                $data['url'] = $attachment['url'];
                $data['mimetype'] = $attachment['mediaType'];
                $data['height'] = $attachment['height'] ?? null;
+               $data['width'] = $attachment['width'] ?? null;
                $data['size'] = $attachment['size'] ?? null;
                $data['preview'] = $attachment['image'] ?? null;
                $data['description'] = $attachment['name'] ?? null;
@@ -602,9 +603,9 @@ class Processor
                                continue;
                        }
 
-                       if (!$item['isForum'] && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) &&
+                       if (!($item['isForum'] ?? false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) &&
                                ($item['post-reason'] == Item::PR_BCC) && !Contact::isSharingByURL($activity['author'], $receiver)) {
-                               Logger::info('Top level post via BCC from a non follower, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id']]);
+                               Logger::info('Top level post via BCC from a non sharer, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id']]);
                                continue;
                        }