diff options
| author | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
| commit | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (patch) | |
| tree | 0015c7c3ea57f7340fbf80fd230a5f5e1c548148 /lib/pleroma/web/pleroma_api/controllers/account_controller.ex | |
| parent | c2186a62d54043ea9638d33f80c7576aba9783e8 (diff) | |
| parent | 0a589c887bd4215e7d443a34c194fd0a3bde8f72 (diff) | |
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/account_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/account_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex index 30cf83567..165afd3b4 100644 --- a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.PleromaAPI.AccountController do @@ -56,7 +56,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountController do nickname_or_email = params[:email] || params[:nickname] with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email), - {:ok, _} <- User.try_send_confirmation_email(user) do + {:ok, _} <- User.maybe_send_confirmation_email(user) do json_response(conn, :no_content, "") end end |