Warnings/Errors reduced - improved relay processing

[friendica.git] / src / Module / Photo.php

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 341858259fbe322ce6f9b719fa02499eceefc489..c521d2be828bc1ec40693b64ffecbbb4b5f8041a 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -258,7 +258,7 @@ class Photo extends BaseModule
                                        return MPhoto::getPhoto($matches[1], $matches[2]);
                                }
 
-                               return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype']);
+                               return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype'] ?? '');
                        case 'media':
                                $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $id, 'type' => Post\Media::IMAGE]);
                                if (empty($media)) {
@@ -276,7 +276,7 @@ class Photo extends BaseModule
                                        return false;
                                }
 
-                               return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
+                               return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype'] ?? '');
                        case 'contact':
                                $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
                                $contact = Contact::getById($id, $fields);
@@ -352,11 +352,11 @@ class Photo extends BaseModule
                                }
                                if (empty($mimetext)) {
                                        if ($customsize <= Proxy::PIXEL_MICRO) {
-                                               $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+                                               $url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_MICRO);
                                        } elseif ($customsize <= Proxy::PIXEL_THUMB) {
-                                               $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+                                               $url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_THUMB);
                                        } else {
-                                               $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+                                               $url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_SMALL);
                                        }
                                }
                                return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);