From: Philipp <admin@philipp.info>
Date: Tue, 10 Aug 2021 19:39:29 +0000 (+0200)
Subject: Revert Photo::getImageDataForPhoto return-type change
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb035771f118e1f289f2ebbbb8a474aa2765c81e;p=friendica.git

Revert Photo::getImageDataForPhoto return-type change
---

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index f74c68da58..a38743d9d6 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -185,7 +185,7 @@ class Photo
 	 *
 	 * @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
 	 *
-	 * @return \Friendica\Object\Image|string
+	 * @return \Friendica\Object\Image
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @throws StorageException
@@ -201,7 +201,7 @@ class Photo
 			// legacy data storage in "data" column
 			$i = self::selectFirst(['data'], ['id' => $photo['id']]);
 			if ($i === false) {
-				return '';
+				return null;
 			}
 			$data = $i['data'];
 		} else {
@@ -210,7 +210,7 @@ class Photo
 				$data = $backendClass->get($backendRef);
 			} catch (ReferenceStorageException $referenceStorageException) {
 				DI::logger()->debug('No data found for photo', ['photo' => $photo, 'exception' => $referenceStorageException]);
-				return '';
+				return null;
 			}
 		}
 		return $data;