Merge pull request #2312 from umbraco/temp-U4-9857

Temp u4 9857
2017-11-08 16:06:53 +11:00
parent b1ceeb23b3 2538e2e9c9
commit e72ec171f7
1 changed files with 12 additions and 4 deletions
--- a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
@@ -37,11 +37,19 @@ namespace Umbraco.Core.Security
                var identity = Thread.CurrentPrincipal.GetUmbracoIdentity();
                if (identity != null)
                {
-                    var user = userService.GetByUsername(identity.Username);
-                    var userIsAdmin = user.IsAdmin();
-                    if (userIsAdmin)
+                    //get the user id from the identity
+                    var userId = 0;
+                    if(int.TryParse(identity.Id.ToString(), out userId))
                    {
-                        canReset = true;
+                        var user = userService.GetUserById(userId);
+                        if (user != null)
+                        {
+                            var userIsAdmin = user.IsAdmin();
+                            if (userIsAdmin)
+                            {
+                                canReset = true;
+                            }
+                        }
                    }
                }
            }