From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 7 Aug 2020 19:54:14 +0000 (-0500)
Subject: Make a new function instead of overloading register_changeset/3
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=474147a67a89f8bd92186dbda93d78d8e2045d52;p=akkoma

Make a new function instead of overloading register_changeset/3
---

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 69b0e1781..d1436a688 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -639,7 +639,7 @@ defmodule Pleroma.User do
   def force_password_reset(user), do: update_password_reset_pending(user, true)
 
   # Used to auto-register LDAP accounts which won't have a password hash stored locally
-  def register_changeset(struct, params = %{password: password})
+  def register_changeset_ldap(struct, params = %{password: password})
       when is_nil(password) do
     params = Map.put_new(params, :accepts_chat_messages, true)
 
diff --git a/lib/pleroma/web/auth/ldap_authenticator.ex b/lib/pleroma/web/auth/ldap_authenticator.ex
index b1645a359..402ab428b 100644
--- a/lib/pleroma/web/auth/ldap_authenticator.ex
+++ b/lib/pleroma/web/auth/ldap_authenticator.ex
@@ -116,7 +116,7 @@ defmodule Pleroma.Web.Auth.LDAPAuthenticator do
             _ -> params
           end
 
-        changeset = User.register_changeset(%User{}, params)
+        changeset = User.register_changeset_ldap(%User{}, params)
 
         case User.register(changeset) do
           {:ok, user} -> user