From 94c080fc42a5d66cabb37701d45bc9fb4e34b47e Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Fri, 2 Sep 2022 19:29:16 +0100 Subject: [PATCH] ensure .exs config is used before default --- lib/pleroma/config/transfer_task.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index 6a3184e6c..7b08efbf7 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -85,7 +85,7 @@ defmodule Pleroma.Config.TransferTask do end defp merge_with_default(%{group: group, key: key, value: value} = setting) do - default = Config.Holder.default_config(group, key) + default = Config.get([key], Config.Holder.default_config(group, key)) merged = cond do