diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-05-31 13:25:04 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-06-16 15:54:22 +0300 |
| commit | e1603ac8fee2a660c3dc510dee5967e0fd1bbd98 (patch) | |
| tree | 67255d007bfa4032b009fa2d6a7de0795337d0a7 /lib | |
| parent | 23decaab81b900bff0f6eacad7ea6a894239e4ce (diff) | |
| download | pleroma-e1603ac8fee2a660c3dc510dee5967e0fd1bbd98.tar.gz pleroma-e1603ac8fee2a660c3dc510dee5967e0fd1bbd98.zip | |
fix attemps to merge map
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/config/config_db.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex index 39b37c42e..70be17ecf 100644 --- a/lib/pleroma/config/config_db.ex +++ b/lib/pleroma/config/config_db.ex @@ -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 |