DNN-5542 User approval email sending code moved from UI to business l…

…ayer
dnnsoftware · Aug 26, 2014 · 455fc9fcb3db038c4cc9d3b8afa57dda15e099d3 · 455fc9f
1 parent 18e2933
commit 455fc9fcb3db038c4cc9d3b8afa57dda15e099d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DNN Platform/Library/Entities/Users/UserEventHandlers.cs b/DNN Platform/Library/Entities/Users/UserEventHandlers.cs
@@ -23,6 +23,8 @@
 using System.ComponentModel.Composition;
 using System.Globalization;
 
+using DotNetNuke.Entities.Portals;
+using DotNetNuke.Services.Mail;
 using DotNetNuke.Services.Social.Notifications;
 
 namespace DotNetNuke.Entities.Users
@@ -45,6 +47,7 @@ public void UserDeleted(object sender, UserEventArgs args)
 
         public void UserApproved(object sender, UserEventArgs args)
         {
+            Mail.SendMail(args.User, MessageType.UserRegistrationPublic, PortalSettings.Current);
             DeleteAllNotifications(args.User.UserID);
         }
 

diff --git a/Website/DesktopModules/Admin/Security/ManageUsers.ascx.cs b/Website/DesktopModules/Admin/Security/ManageUsers.ascx.cs
@@ -692,7 +692,7 @@ private void MembershipAuthorized(object sender, EventArgs e)
                     UserInfo user = User;
                     User.Membership.Password = UserController.GetPassword(ref user, "");
                 }
-                Mail.SendMail(User, MessageType.UserRegistrationPublic, PortalSettings);
+
                 BindMembership();
             }
             catch (Exception exc) //Module failed to load