UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AccountService, fix json casting

Browse source
This commit is contained in:
Daniel Supernault 2021-12-30 23:11:46 -07:00
parent 92bc28456d
commit e5f8f3441c
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Services/AccountService.php
View file

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