head fixings

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index c67520b554d92879e21e37e087388380f4a9ff6c..f2765280b65940c3be960419d1fb989be29b6e81 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -32,6 +32,7 @@ use Friendica\Model\Profile;
 use Friendica\Core\Storage\Type\ExternalResource;
 use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\NotModifiedException;
 use Friendica\Object\Image;
@@ -288,9 +289,10 @@ class Photo extends BaseModule
                                        }
                                }
 
-                               If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
+                               if (!empty($contact['uid']) && empty($contact['photo']) && empty($contact['avatar'])) {
                                        $contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
                                }
+
                                if (!empty($contact['photo']) && !empty($contact['avatar'])) {
                                        // Fetch photo directly
                                        $resourceid = MPhoto::ridFromURI($contact['photo']);
@@ -307,7 +309,7 @@ class Photo extends BaseModule
                                }
                                $mimetext = '';
                                if (!empty($url)) {
-                                       $mime = ParseUrl::getContentType($url);
+                                       $mime = ParseUrl::getContentType($url, HttpClientAccept::IMAGE);
                                        if (!empty($mime)) {
                                                $mimetext = $mime[0] . '/' . $mime[1];
                                        } else {
@@ -316,6 +318,8 @@ class Photo extends BaseModule
                                        if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
                                                Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
                                                $mimetext = '';
+                                       } if (!empty($mimetext)) {
+                                               Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
                                        }
                                }
                                if (empty($mimetext)) {