Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 08:37:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle changePicture callback properly

Browse Source
This commit is contained in:
barisusakli
2014-12-23 18:09:23 -05:00
parent 3d9e86d9b2
commit 4b1b98e229
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/socket.io/user.js
View File

@@ -152,7 +152,7 @@ SocketUser.changePicture = function(socket, data, callback) {
function changePicture(uid, callback) {
user.getUserField(uid, type, function(err, picture) {
if(err) {
if (err) {
return callback(err);
}
@@ -168,22 +168,13 @@ SocketUser.changePicture = function(socket, data, callback) {
return callback(new Error('[[error:invalid-image-type]]'));
}
if(socket.uid === parseInt(data.uid, 10)) {
changePicture(socket.uid, function(err) {
if(err) {
return callback(err);
}
});
return;
if (socket.uid === parseInt(data.uid, 10)) {
return changePicture(socket.uid, callback);
}
user.isAdministrator(socket.uid, function(err, isAdmin) {
if(err) {
return callback(err);
}
if(!isAdmin) {
return callback(new Error('[[error:no-privileges]]'));
if (err || !isAdmin) {
return callback(err || new Error('[[error:no-privileges]]'));
}
changePicture(data.uid, callback);