Ensure we can't collide keys

2022-09-02 19:35:58 +01:00 · 2022-09-02 19:35:58 +01:00 · e9e76b8ee6
parent 94c080fc42
commit e9e76b8ee6
1 changed files with 5 additions and 1 deletions
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@ -85,7 +85,11 @@ defmodule Pleroma.Config.TransferTask do
  end

  defp merge_with_default(%{group: group, key: key, value: value} = setting) do
-    default = Config.get([key], Config.Holder.default_config(group, key))
+    default = if group == :pleroma do
+      Config.get([key], Config.Holder.default_config(group, key))
+    else
+      Config.Holder.default_config(group, key)
+    end

    merged =
      cond do