clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12389 from annando/fatal 

Handle some fatal errors
This commit is contained in:
Hypolite Petovan 2022-12-11 15:04:54 -05:00 committed by GitHub
parent e72d17c3af 5d3248d57b
commit 0d95535137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Factory/Api/Mastodon/Status.php
View File

@ -199,8 +199,11 @@ class Status extends BaseFactory
}
}
$item['body'] = $this->contentItem->addSharedPost($item);
$item['raw-body'] = $this->contentItem->addSharedPost($item, $item['raw-body']);
$item['body'] = $this->contentItem->addSharedPost($item);
if (!is_null($item['raw-body'])) {
$item['raw-body'] = $this->contentItem->addSharedPost($item, $item['raw-body']);
}
if ($is_reshare) {
$reshare = $this->createFromUriId($uriId, $uid, false)->toArray();

7
src/Util/Images.php
View File

@ -247,8 +247,11 @@ class Images
if ($data) {
$image = new Image($img_str);
$data['blurhash'] = $image->getBlurHash();
$data['size'] = $filesize;
if ($image->isValid()) {
$data['blurhash'] = $image->getBlurHash();
}
$data['size'] = $filesize;
}
return is_array($data) ? $data : [];