diff options
| author | lain <lain@soykaf.club> | 2020-05-13 12:44:16 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-13 12:44:16 +0200 |
| commit | 3cff4e24cd8c56af47b1983ea97ec4643dbc183e (patch) | |
| tree | 63e27727ca94f1b57832d6e872ad319c97719bbb /lib/pleroma/user.ex | |
| parent | c0ea5c60e4e709d3d4415de42a65f878b55dc3bb (diff) | |
| parent | 6706cdce65f8b2dda55380dbfdad5e41e600af2d (diff) | |
| download | pleroma-3cff4e24cd8c56af47b1983ea97ec4643dbc183e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index a86cc3202..cba391072 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -9,7 +9,6 @@ defmodule Pleroma.User do import Ecto.Query import Ecto, only: [assoc: 2] - alias Comeonin.Pbkdf2 alias Ecto.Multi alias Pleroma.Activity alias Pleroma.Config @@ -1926,7 +1925,7 @@ defmodule Pleroma.User do defp put_password_hash( %Ecto.Changeset{valid?: true, changes: %{password: password}} = changeset ) do - change(changeset, password_hash: Pbkdf2.hashpwsalt(password)) + change(changeset, password_hash: Pbkdf2.hash_pwd_salt(password)) end defp put_password_hash(changeset), do: changeset |