Merge pull request #11647 from Quix0r/fixes/type-error-exception

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index d050188aacceac3a49008aed6f51056d5c2e0bb6..86c737aa4e092208932ee4c8e3fc9717cd98c5f6 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -32,6 +32,7 @@ use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Core\Storage\Type\ExternalResource;
 use Friendica\Core\Storage\Type\SystemResource;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
@@ -224,8 +225,7 @@ class Photo extends BaseModule
                                'output' => number_format($output, 3), 'rest' => number_format($rest, 3)]);
                }
 
-               DI::page()->logRuntime();
-               exit();
+               System::exit();
        }
 
        private static function getPhotoByid(int $id, $type, $customsize)
@@ -270,7 +270,7 @@ class Photo extends BaseModule
 
                                return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
                        case "contact":
-                               $fields = ['uid', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+                               $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
                                $contact = Contact::getById($id, $fields);
                                if (empty($contact)) {
                                        return false;