From 77b94068410d2baf28408c3ad659fa0bd650c0de Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 28 Dec 2015 14:37:04 +0200
Subject: [PATCH] closes #4008

---
 src/socket.io/groups.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js
index 2b4246b625..2321588d7f 100644
--- a/src/socket.io/groups.js
+++ b/src/socket.io/groups.js
@@ -43,10 +43,10 @@ SocketGroups.join = function(socket, data, callback) {
 				return callback(err);
 			}
 
-			if (checks.isPrivate && !checks.isAdmin) {
-				groups.requestMembership(data.groupName, socket.uid, callback);
-			} else {
+			if (!checks.isPrivate || checks.isAdmin) {
 				groups.join(data.groupName, socket.uid, callback);
+			} else {
+				groups.requestMembership(data.groupName, socket.uid, callback);
 			}
 		});
 	});