From 041531a2e3a1fedb0e1189fee0f65239d4f760ae Mon Sep 17 00:00:00 2001 From: barisusakli <barisusakli@gmail.com> Date: Mon, 21 Mar 2016 16:48:07 +0200 Subject: [PATCH] closes #4424 --- src/socket.io/groups.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 8e35d74bca..a54db76b05 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -155,7 +155,7 @@ SocketGroups.kick = isOwner(function(socket, data, callback) { if (socket.uid === parseInt(data.uid, 10)) { return callback(new Error('[[error:cant-kick-self]]')); } - + groups.ownership.isOwner(data.uid, data.groupName, function(err, isOwner) { if (err) { return callback(err); @@ -178,16 +178,16 @@ SocketGroups.create = function(socket, data, callback) { }; SocketGroups.delete = function(socket, data, callback) { - if (data.groupName === 'administrators' || data.groupName === 'registered-users') { + if (data.groupName === 'administrators' || + data.groupName === 'registered-users' || + data.groupName === 'Global Moderators') { return callback(new Error('[[error:not-allowed]]')); } - var tasks = { + async.parallel({ isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName), isAdmin: async.apply(user.isAdministrator, socket.uid) - }; - - async.parallel(tasks, function(err, checks) { + }, function(err, checks) { if (err) { return callback(err); }