Ports behaviour from membershiphelper from v7 to 6 to make them the same

nul800sebastiaan · nul800sebastiaan · commit a768fe5bb3fb · 2014-04-02T11:42:48.000+02:00
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -276,8 +276,15 @@ public ProfileModel GetCurrentMemberProfileModel()
             {                
                 var membershipUser = provider.GetCurrentUser();
                 var member = GetCurrentMember();
-                //this shouldn't happen
-                if (member == null) return null;
+                //this shouldn't happen but will if the member is deleted in the back office while the member is trying
+                // to use the front-end!
+                if (member == null)
+                {
+                    //log them out since they've been removed
+                    FormsAuthentication.SignOut();
+
+                    return null;
+                }
 
                 var model = ProfileModel.CreateModel();
                 model.Name = member.Name;
@@ -416,17 +423,31 @@ public LoginStatusModel GetCurrentLoginStatus()
             if (provider.IsUmbracoMembershipProvider())
             {
                 var member = GetCurrentMember();
-                //this shouldn't happen
-                if (member == null) return model;
+                //this shouldn't happen but will if the member is deleted in the back office while the member is trying
+                // to use the front-end!
+                if (member == null)
+                {
+                    //log them out since they've been removed
+                    FormsAuthentication.SignOut();
+                    model.IsLoggedIn = false;
+                    return model;
+                }
                 model.Name = member.Name;
                 model.Username = member.Username;
                 model.Email = member.Email;
             }
             else
             {
                 var member = provider.GetCurrentUser();
-                //this shouldn't happen
-                if (member == null) return null;
+                //this shouldn't happen but will if the member is deleted in the back office while the member is trying
+                // to use the front-end!
+                if (member == null)
+                {
+                    //log them out since they've been removed
+                    FormsAuthentication.SignOut();
+                    model.IsLoggedIn = false;
+                    return model;
+                }
                 model.Name = member.UserName;
                 model.Username = member.UserName;
                 model.Email = member.Email;
