From 70b3c8080ecb3bafea7dd57ec07a410061b26953 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 24 Mar 2023 09:01:06 +0000
Subject: encode object after we have dealt with deleted items and work around
 a php error

---
 Zotlabs/Lib/Activity.php |  8 ++++----
 Zotlabs/Thumbs/Text.php  | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index d4a89d2a4..baa27a051 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -419,10 +419,6 @@ class Activity {
 			$objtype = self::activity_obj_mapper($i['obj_type']);
 		}
 
-		if (isset($i['obj']) && $i['obj']) {
-			$ret = Activity::encode_object($i['obj']);
-		}
-
 		if (intval($i['item_deleted'])) {
 			$ret['type']       = 'Tombstone';
 			$ret['formerType'] = $objtype;
@@ -434,6 +430,10 @@ class Activity {
 			return $ret;
 		}
 
+		if (isset($i['obj']) && $i['obj']) {
+			$ret = Activity::encode_object($i['obj']);
+		}
+
 		if (isset($i['obj']) && $i['obj']) {
 			if (is_array($i['obj'])) {
 				$ret = $i['obj'];
diff --git a/Zotlabs/Thumbs/Text.php b/Zotlabs/Thumbs/Text.php
index 3ee7819bd..31e27d014 100644
--- a/Zotlabs/Thumbs/Text.php
+++ b/Zotlabs/Thumbs/Text.php
@@ -11,6 +11,10 @@ class Text {
 
 	function Thumb($attach,$preview_style,$height = 300, $width = 300) {
 
+		if (empty($attach['content'])) {
+			return;
+		}
+
 		$stream = @fopen(dbunescbin($attach['content']),'rb');
 		if($stream) {
 			$content = trim(stream_get_contents($stream,4096));
@@ -25,13 +29,13 @@ class Text {
 			$colour = imagecolorallocate($image,0,0,0);
 			$border = imagecolorallocate($image,208,208,208);
 
-			$x1 = 0; 
-			$y1 = 0; 
-			$x2 = ImageSX($image) - 1; 
-			$y2 = ImageSY($image) - 1; 
+			$x1 = 0;
+			$y1 = 0;
+			$x2 = ImageSX($image) - 1;
+			$y2 = ImageSY($image) - 1;
 
-			for($i = 0; $i < 2; $i++) { 
-				ImageRectangle($image, $x1++, $y1++, $x2--, $y2--, $border); 
+			for($i = 0; $i < 2; $i++) {
+				ImageRectangle($image, $x1++, $y1++, $x2--, $y2--, $border);
 			}
 
 			foreach($content_a as $l => $t) {
@@ -46,4 +50,4 @@ class Text {
 			imagejpeg($image,dbunescbin($attach['content']) . '.thumb');
 		}
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3