X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig.ex;h=fcc0397101368e26d3eb22c5734160eaa017a205;hb=3c0abfca53751624ebd6ea7174ee880d9e7b29e7;hp=189faa15f8ef13ba858e75d2a6a14be54241a6b0;hpb=0a02ed7a2f63abc80fbef70c1a3ad64c01516a75;p=akkoma

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 189faa15f..fcc039710 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
@@ -34,7 +38,7 @@ defmodule Pleroma.Config do
 
   def put([parent_key | keys], value) do
     parent =
-      Application.get_env(:pleroma, parent_key)
+      Application.get_env(:pleroma, parent_key, [])
       |> put_in(keys, value)
 
     Application.put_env(:pleroma, parent_key, parent)