Unverified Commit 066fe1a6 authored by jeff's avatar jeff
Browse files

use nil instead of empty string

parent dffde663
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
# Configures http settings, upstream proxy etc. # Configures http settings, upstream proxy etc.
config :pleroma, :http, config :pleroma, :http,
proxy_url: "" proxy_url: nil
config :pleroma, :instance, config :pleroma, :instance,
version: version, version: version,
......
...@@ -4,9 +4,9 @@ defmodule Pleroma.HTTP do ...@@ -4,9 +4,9 @@ defmodule Pleroma.HTTP do
def process_request_options(options) do def process_request_options(options) do
config = Application.get_env(:pleroma, :http, []) config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, "") proxy = Keyword.get(config, :proxy_url, nil)
case proxy do case proxy do
"" -> options nil -> options
_ -> options ++ [proxy: proxy] _ -> options ++ [proxy: proxy]
end end
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment