From 4d8b4dcf3572ad6c7b15cf1b54b94803fdd2b038 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 24 May 2023 23:41:48 -0600 Subject: [PATCH 1/2] Update StatusService, fix bug in getFull method --- app/Services/StatusService.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php index 05f8939b3..99bcee2b0 100644 --- a/app/Services/StatusService.php +++ b/app/Services/StatusService.php @@ -121,6 +121,9 @@ class StatusService public static function getFull($id, $pid, $publicOnly = true) { $res = self::get($id, $publicOnly); + if(!$res || !isset($res['account']) || !isset($res['account']['id'])) { + return $res; + } $res['relationship'] = RelationshipService::get($pid, $res['account']['id']); return $res; } From 86e20e927d95389137d8d9c4d6f40e38109db6bf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 24 May 2023 23:42:35 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38aa82c67..d077f71c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Release Notes ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.7...dev) + +### Updates +- Update StatusService, fix bug in getFull method ([4d8b4dcf](https://github.com/pixelfed/pixelfed/commit/4d8b4dcf)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.7 (2023-05-24)](https://github.com/pixelfed/pixelfed/compare/v0.11.6...v0.11.7) @@ -57,7 +60,6 @@ - Update AP Inbox, fix delete handling ([2800c888](https://github.com/pixelfed/pixelfed/commit/2800c888)) - Update login/register views and captcha config, enable login or register captchas or both ([c071c719](https://github.com/pixelfed/pixelfed/commit/c071c719)) - Update login form, allow admins to enable captcha after X failed attempts. Admins can set the number of attempts before captcha is shown, default is 2 attempts before captcha is required ([221ddce0](https://github.com/pixelfed/pixelfed/commit/221ddce0)) -- ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)