aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-05-14 14:58:45 +0000
committerkaniini <nenolod@gmail.com>2019-05-14 14:58:45 +0000
commitdfd031c26adb78fbbbf44943a81ef506fbbd1324 (patch)
tree573398026f0b1a67b130826fe133496b62743279 /lib
parent37dc1cc431e8ba4c3f5af418a2690e2a1ae3570e (diff)
parenta18b2c0b12b413c9a8d0aa0d4fd3b15e0e843cdf (diff)
downloadpleroma-dfd031c26adb78fbbbf44943a81ef506fbbd1324.tar.gz
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
Fix Pleroma.Config.get!/1 raising an error when value is false See merge request pleroma/pleroma!1148
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/config.ex8
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