diff options
| author | lain <lain@soykaf.club> | 2019-05-17 12:26:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-17 12:26:59 +0200 |
| commit | 412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8 (patch) | |
| tree | d7dc5c61e4b3a01b21e33ccbea3aa4bfffc051aa /lib/pleroma/config.ex | |
| parent | f1e67bdc312ba16a37916024244d6cb9d4417c9e (diff) | |
| parent | e5b34f5e0544371603bc2b570c26ede3182c2f8b (diff) | |
| download | pleroma-412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
Diffstat (limited to 'lib/pleroma/config.ex')
| -rw-r--r-- | lib/pleroma/config.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex index 189faa15f..71a47b9fb 100644 --- a/lib/pleroma/config.ex +++ b/lib/pleroma/config.ex @@ -12,8 +12,12 @@ defmodule Pleroma.Config do def get([key], default), do: get(key, default) def get([parent_key | keys], default) do - Application.get_env(:pleroma, parent_key) - |> get_in(keys) || default + case :pleroma + |> Application.get_env(parent_key) + |> get_in(keys) do + nil -> default + any -> any + end end def get(key, default) do |