X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAttach.php;h=6182727c9762ad85d63c6365941bc8636129c5aa;hb=15caf4b3f7eacda399a56b1ad8eeb9d3257306d9;hp=8d91f90e954707d5be9a718ebbce08ea7192ec21;hpb=d09b3f5bdeae444f785f6283e55dbf2f61caadac;p=friendica.git

diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 8d91f90e95..6182727c97 100644
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.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
  *
@@ -28,7 +28,7 @@ use Friendica\DI;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 
 /**
  * Class to handle attach dabatase table
@@ -159,8 +159,12 @@ class Attach
 	 */
 	public static function getData($item)
 	{
-		$backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-		if ($backendClass === null) {
+		if (!empty($item['data'])) {
+			return $item['data'];
+		}
+
+		$backendClass = DI::storageManager()->getByName($item['backend-class'] ?? '');
+		if (empty($backendClass)) {
 			// legacy data storage in 'data' column
 			$i = self::selectFirst(['data'], ['id' => $item['id']]);
 			if ($i === false) {
@@ -275,7 +279,7 @@ class Attach
 
 			foreach($items as $item) {
 				$backend_class = DI::storageManager()->getByName($item['backend-class'] ?? '');
-				if ($backend_class !== null) {
+				if (!empty($backend_class)) {
 					$fields['backend-ref'] = $backend_class->put($img->asString(), $item['backend-ref'] ?? '');
 				} else {
 					$fields['data'] = $img->asString();
@@ -307,7 +311,7 @@ class Attach
 
 		foreach($items as $item) {
 			$backend_class = DI::storageManager()->getByName($item['backend-class'] ?? '');
-			if ($backend_class !== null) {
+			if (!empty($backend_class)) {
 				$backend_class->delete($item['backend-ref'] ?? '');
 			}
 		}