Merge pull request #10133 from annando/notice

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 16903885959bb394e7871dc7dc1267724af0caa2..567a17d5b5dfd47cb1591ebf6a731bececd28716 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -188,8 +188,12 @@ class Photo
         */
        public static function getImageDataForPhoto(array $photo)
        {
+               if (!empty($photo['data'])) {
+                       return $photo['data'];
+               }
+
                $backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-               if ($backendClass === null) {
+               if (empty($backendClass)) {
                        // legacy data storage in "data" column
                        $i = self::selectFirst(['data'], ['id' => $photo['id']]);
                        if ($i === false) {
@@ -308,7 +312,7 @@ class Photo
                        $storage = DI::storage();
                }
 
-               if ($storage === null) {
+               if (empty($storage)) {
                        $data = $Image->asString();
                } else {
                        $backend_ref = $storage->put($Image->asString(), $backend_ref);
@@ -368,7 +372,7 @@ class Photo
 
                while ($photo = DBA::fetch($photos)) {
                        $backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-                       if ($backend_class !== null) {
+                       if (!empty($backend_class)) {
                                if ($backend_class->delete($photo["backend-ref"] ?? '')) {
                                        // Delete the photos after they had been deleted successfully
                                        DBA::delete("photo", ['id' => $photo['id']]);
@@ -402,7 +406,7 @@ class Photo
 
                        foreach($photos as $photo) {
                                $backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-                               if ($backend_class !== null) {
+                               if (!empty($backend_class)) {
                                        $fields["backend-ref"] = $backend_class->put($img->asString(), $photo['backend-ref']);
                                } else {
                                        $fields["data"] = $img->asString();
@@ -464,7 +468,7 @@ class Photo
                        $maximagesize = DI::config()->get('system', 'maximagesize');
                        if (!empty($maximagesize) && ($filesize > $maximagesize)) {
                                Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $Image->getType()]);
-                               if (($Image->getType() == 'image/gif')) {
+                               if ($Image->getType() == 'image/gif') {
                                        $Image->toStatic();
                                        $Image = new Image($Image->asString(), 'image/png');