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

if email didnt change dont update and dont log

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-05 01:53:01 -05:00
parent 48074ea93b
commit e69611fa22
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/user.js
View File

@@ -245,23 +245,29 @@ var bcrypt = require('bcrypt'),
data[field] = sanitize(data[field]).escape();
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 next(err);
}
if(userData.email === data.email) {
return next();
}
var gravatarpicture = User.createGravatarURLFromEmail(data.email);
User.setUserField(uid, 'gravatarpicture', gravatarpicture);
db.deleteObjectField('email:uid', userData.email);
db.setObjectField('email:uid', data.email, uid);
User.setUserField(uid, field, data[field]);
User.setUserField(uid, 'email', data.email);
if (userData.picture !== userData.uploadedpicture) {
returnData.picture = gravatarpicture;
User.setUserField(uid, 'picture', gravatarpicture);
}
returnData.gravatarpicture = gravatarpicture;
events.logEmailChange(uid, userData.email, data.email);
next(null);
next();
});
return;
} else if (field === 'signature') {
@@ -274,9 +280,9 @@ var bcrypt = require('bcrypt'),
User.setUserField(uid, field, data[field]);
next(null);
next();
} else {
next(null);
next();
}
}
};