Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2013-09-11 14:41:30 -04:00
parent 9ebff816dc 325e402d0f
commit f1144f3a7e
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/user.js
View File

@@ -224,29 +224,27 @@ var utils = require('./../public/src/utils.js'),
async.series([isSignatureValid, isEmailAvailable], function(err, results) {
if(err) {
console.log(err);
callback(returnData);
callback(err, returnData);
} else {
async.each(fields, updateField, function(err) {
if(err) {
console.log(err);
callback(returnData);
callback(err, returnData);
} else {
returnData.success = true;
callback(returnData);
callback(null, returnData);
}
});
}
});
function updateField(field, callback) {
function updateField(field, next) {
if(data[field] !== undefined) {
if(field === 'email') {
var gravatarpicture = User.createGravatarURLFromEmail(data[field]);
User.setUserField(uid, 'gravatarpicture', gravatarpicture);
User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function(err, userData) {
if(err)
return callback(err);
return next(err);
RDB.del('email:' + userData['email'] + ':uid');
RDB.set('email:' + data['email'] + ':uid', uid);
@@ -256,7 +254,7 @@ var utils = require('./../public/src/utils.js'),
User.setUserField(uid, 'picture', gravatarpicture);
}
returnData.gravatarpicture = gravatarpicture;
callback(null);
next(null);
});
return;
} else if(field === 'signature') {
@@ -265,9 +263,9 @@ var utils = require('./../public/src/utils.js'),
User.setUserField(uid, field, data[field]);
callback(null);
next(null);
} else {
callback(null);
next(null);
}
}
}