hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix attemps to merge map

Browse source
This commit is contained in:
Alexander Strizhakov 2020-05-31 13:25:04 +03:00
commit e1603ac8fe
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/config/config_db.ex
View file

@ -135,7 +135,8 @@ defmodule Pleroma.ConfigDB do
with %ConfigDB{} = config <- ConfigDB.get_by_params(search_opts),
{_, true, config} <- {:partial_update, can_be_partially_updated?(config), config},
{_, true, config} <- {:can_be_merged, is_list(params[:value]), config} do
{_, true, config} <-
{:can_be_merged, is_list(params[:value]) and is_list(config.value), config} do
new_value = merge_group(config.group, config.key, config.value, params[:value])
update(config, %{value: new_value})
else