Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-03-13 18:43:40 +11:00
parent 67f8b8f88b bcc2424577
commit 75bc3e09c6
1 changed files with 8 additions and 3 deletions
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -142,9 +142,14 @@ namespace umbraco.cms.businesslogic.member
                }
            }

-            return ApplicationContext.Current.Services.MemberService.GetAllMembers(ids.ToArray())
-                .Select(x => new Member(x))
-                .ToArray();
+            if (ids.Any())
+            {
+                return ApplicationContext.Current.Services.MemberService.GetAllMembers(ids.ToArray())
+                    .Select(x => new Member(x))
+                    .ToArray();
+            }
+
+            return new Member[] { };
        }

        /// <summary>