forked from mirror/pixelfed
Update AccountService, fix json casting
This commit is contained in:
parent
92bc28456d
commit
e5f8f3441c
1 changed files with 4 additions and 2 deletions
|
@ -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;
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue