diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 99fb48e..4634807 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.2.538")] -[assembly: AssemblyFileVersion("3.0.2.538")] +[assembly: AssemblyVersion("3.0.2.539")] +[assembly: AssemblyFileVersion("3.0.2.539")] diff --git a/Core/Users.cs b/Core/Users.cs index 5f0b6e1..f846d7c 100644 --- a/Core/Users.cs +++ b/Core/Users.cs @@ -209,11 +209,14 @@ namespace ScrewTurn.Wiki { public static bool ModifyUser(UserInfo user, string displayName, string password, string email, bool active) { if(user.Provider.UserAccountsReadOnly) return false; - bool done = user.Provider.ModifyUser(user, displayName, password, email, active) != null; + UserInfo newUser = user.Provider.ModifyUser(user, displayName, password, email, active); - if(done) { + if(newUser != null) { Log.LogEntry("User " + user.Username + " updated", EntryType.General, Log.SystemUsername); - Host.Instance.OnUserAccountActivity(user, UserAccountActivity.AccountModified); + Host.Instance.OnUserAccountActivity(newUser, UserAccountActivity.AccountModified); + if(user.Active != newUser.Active) { + Host.Instance.OnUserAccountActivity(newUser, newUser.Active ? UserAccountActivity.AccountActivated : UserAccountActivity.AccountDeactivated); + } return true; } else {