added icon container styles back to ACP, proper hooking-up of iconSelect module in group settings panel, #2588

This commit is contained in:
Julian Lam
2015-01-11 17:44:51 -05:00
parent 69ed8ac45d
commit 240056d169
3 changed files with 36 additions and 16 deletions

View File

@@ -10,7 +10,7 @@ SocketGroups.join = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
if (meta.config.allowPrivateGroups) {
if (meta.config.allowPrivateGroups !== '0') {
groups.isPrivate(data.groupName, function(err, isPrivate) {
if (isPrivate) {
groups.requestMembership(data.groupName, socket.uid, callback);