File and category aren't using "term" anymore

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index b5d1ea894265c7c9abd0adf151ab4ad11c650e90..9d8b5611f7f8b5f2543b0cc74e92521be7a6a0ba 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -432,9 +432,7 @@ class Photo
                        return false;
                }
 
-               if (empty($type)) {
-                       $type = Images::guessType($image_url, true);
-               }
+               $type = Images::getMimeTypeByData($img_str, $image_url, $type);
 
                $Image = new Image($img_str, $type);
                if ($Image->isValid()) {
@@ -662,10 +660,9 @@ class Photo
                                'resource-id' => $image_rid, 'uid' => $uid
                        ];
                        if (!Photo::exists($condition)) {
-                               $condition = ['resource-id' => $image_rid];
-                               $photo = self::selectFirst(['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'uid'], $condition);
+                               $photo = self::selectFirst(['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'uid'], ['resource-id' => $image_rid]);
                                if (!DBA::isResult($photo)) {
-                                       Logger::info('Image not found', ['condition' => $condition]);
+                                       Logger::info('Image not found', ['resource-id' => $image_rid]);
                                } else {
                                        Logger::info('Mismatching permissions', ['condition' => $condition, 'photo' => $photo]);
                                }