projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emails
/
user_email.ex
diff --git
a/lib/pleroma/emails/user_email.ex
b/lib/pleroma/emails/user_email.ex
index 8502a0d0c6d5ab189582fdbc2982f9a7c64d89a2..9346207658f2bc48491b06dfafe81e439004765a 100644
(file)
--- a/
lib/pleroma/emails/user_email.ex
+++ b/
lib/pleroma/emails/user_email.ex
@@
-23,13
+23,8
@@
defmodule Pleroma.Emails.UserEmail do
defp recipient(email, name), do: {name, email}
defp recipient(%Pleroma.User{} = user), do: recipient(user.email, user.name)
defp recipient(email, name), do: {name, email}
defp recipient(%Pleroma.User{} = user), do: recipient(user.email, user.name)
- def password_reset_email(user, password_reset_token) when is_binary(password_reset_token) do
- password_reset_url =
- Router.Helpers.util_url(
- Endpoint,
- :show_password_reset,
- password_reset_token
- )
+ def password_reset_email(user, token) when is_binary(token) do
+ password_reset_url = Router.Helpers.reset_password_url(Endpoint, :reset, token)
html_body = """
<h3>Reset your password at #{instance_name()}</h3>
html_body = """
<h3>Reset your password at #{instance_name()}</h3>