From 69ffecd686fb58e1e3904eb020d6abddd02491a1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Dec 2013 13:08:06 +1100
Subject: [PATCH] Fixes: U4-3741 GetMemberFromLoginNameAndPassword Always
 Return Null

---
 src/Umbraco.Tests/PluginManagerTests.cs       | 25 +------------------
 .../members/MembersMembershipProvider.cs      |  7 +++++-
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Tests/PluginManagerTests.cs b/src/Umbraco.Tests/PluginManagerTests.cs
index 3463af93b2..175271e64e 100644
--- a/src/Umbraco.Tests/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/PluginManagerTests.cs
@@ -359,30 +359,7 @@ namespace Umbraco.Tests
 
             Assert.IsNull(shouldNotFind);
         }
-        
-        /// <summary>
-        /// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
-        /// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
-        /// </summary>
-        [Test]
-        public void TypeList_Resolves_Explicit_Types()
-        {
-            var types = new HashSet<PluginManager.TypeList>();
-
-            var propEditors = new PluginManager.TypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes);
-            propEditors.AddType(typeof (LabelPropertyEditor));
-            types.Add(propEditors);
-
-            var found = types.SingleOrDefault(x => x.IsTypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
-
-            Assert.IsNotNull(found);
-
-            //This should not find a type list of this type
-            var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList<IParameterEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
-
-            Assert.IsNull(shouldNotFind);
-        }
-
+     
         [XsltExtension("Blah.Blah")]
         public class MyXsltExtension
         {
diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs
index b8d207b9a8..45090a4acc 100644
--- a/src/umbraco.providers/members/MembersMembershipProvider.cs
+++ b/src/umbraco.providers/members/MembersMembershipProvider.cs
@@ -793,7 +793,7 @@ namespace umbraco.providers.members
                 }
 
                 //check for approve status. If not approved, then set the member property to null
-                if (!CheckApproveStatus(m)) {
+                if (m != null && !CheckApproveStatus(m)) {
                     m = null;
                 }
 
@@ -859,6 +859,11 @@ namespace umbraco.providers.members
                             }
                         }
                     }
+                    else
+                    {
+                        //There is no property so we shouldn't use the approve status
+                        isApproved = true;
+                    }
                 }
             }
             else {