hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/signup-without-email' into 'develop'

Browse source 
Allow account registration without an email

See merge request pleroma/pleroma!2246
This commit is contained in:
feld 2020-03-11 16:53:05 +00:00 • committed by rinpatch
commit e7837bc14e
5 changed files with 90 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/user.ex
View file

@ -530,7 +530,14 @@ defmodule Pleroma.User do
end
def maybe_validate_required_email(changeset, true), do: changeset
def maybe_validate_required_email(changeset, _), do: validate_required(changeset, [:email])
def maybe_validate_required_email(changeset, _) do
if Pleroma.Config.get([:instance, :account_activation_required]) do
validate_required(changeset, [:email])
else
changeset
end
end
defp put_ap_id(changeset) do
ap_id = ap_id(%User{nickname: get_field(changeset, :nickname)})