From e5f8f3441ccf3bb73e2da99b35127fe43eafdd80 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 30 Dec 2021 23:11:46 -0700 Subject: [PATCH 1/2] Update AccountService, fix json casting --- app/Services/AccountService.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Services/AccountService.php b/app/Services/AccountService.php index b57361069..2c3f97a7b 100644 --- a/app/Services/AccountService.php +++ b/app/Services/AccountService.php @@ -51,12 +51,14 @@ class AccountService ->map(function($item, $key) { if($key == 'compose_settings') { $cs = self::defaultSettings()['compose_settings']; - return array_merge($cs, $item ?? []); + $ms = is_array($item) ? $item : []; + return array_merge($cs, $ms); } if($key == 'other') { $other = self::defaultSettings()['other']; - return array_merge($other, $item ?? []); + $mo = is_array($item) ? $item : []; + return array_merge($other, $mo); } return $item; }); From 35e2cf1f6b7d9ad9d66e5030dfb791023ba95fbf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 30 Dec 2021 23:12:16 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e95f285e..3457281da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,6 +75,8 @@ - Updated Timeline, add new ui promo in timelines that can be hidden using localstorage. ([e13959ae](https://github.com/pixelfed/pixelfed/commit/e13959ae)) - Updated FederationController, increase webfinger cache ttl from 12 hours to 14 days. ([745c3580](https://github.com/pixelfed/pixelfed/commit/745c3580)) - Updated DiscoverController, add yearly option and increase limit from 15 to 30 posts. ([10b6058c](https://github.com/pixelfed/pixelfed/commit/10b6058c)) +- Updated RemoteAvatarFetch job, fixed bug preventing new avatars from being stored. ([92bc2845](https://github.com/pixelfed/pixelfed/commit/92bc2845)) +- Updated AccountService, fix json casting ([e5f8f344](https://github.com/pixelfed/pixelfed/commit/e5f8f344)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)