Skip to content
Snippets Groups Projects
Commit a64eb2b3 authored by Alexander Strizhakov's avatar Alexander Strizhakov
Browse files

fallback to the old behaviour

admin and user mailers
parent fe511a6c
Branches
No related tags found
No related merge requests found
......@@ -11,7 +11,10 @@ defmodule Pleroma.AdminEmail do
defp instance_config, do: Pleroma.Config.get(:instance)
defp instance_name, do: instance_config()[:name]
defp instance_notify_email, do: instance_config()[:notify_email]
defp instance_notify_email do
Keyword.get(instance_config(), :notify_email, instance_config()[:email])
end
defp user_url(user) do
Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
......
......@@ -15,7 +15,8 @@ defmodule Pleroma.UserEmail do
defp instance_name, do: instance_config()[:name]
defp sender do
{instance_name(), instance_config()[:notify_email]}
email = Keyword.get(instance_config(), :notify_email, instance_config()[:email])
{instance_name(), email}
end
defp recipient(email, nil), do: email
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment