aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Tinio <aptinio@gmail.com>2019-05-14 06:40:59 +0800
committerAaron Tinio <aptinio@gmail.com>2019-05-14 06:40:59 +0800
commita18b2c0b12b413c9a8d0aa0d4fd3b15e0e843cdf (patch)
tree4149ca3be29af1c842704363194ca41469c4e890 /lib
parentcdcdbd88da76f18c21da7f6f15a29883044902c8 (diff)
downloadpleroma-a18b2c0b12b413c9a8d0aa0d4fd3b15e0e843cdf.tar.gz
Fix Pleroma.Config.get!/1 raising an error when value is false
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