TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

encode object after we have dealt with deleted items and work around a php error

Browse Source
This commit is contained in:
Mario
2023-03-24 09:01:06 +00:00
parent 2c483c460a
commit 70b3c8080e
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Lib/Activity.php
View File

@@ -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'];

18
Zotlabs/Thumbs/Text.php
View File

@@ -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');
}
}
}
}