Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-05 23:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict artifact that was left in

Browse Source
This commit is contained in:
Julian Lam
2017-03-06 09:58:02 -05:00
parent af2d9fb85b
commit f0d9bddd56
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/user/data.js
View File

@@ -64,28 +64,24 @@ module.exports = function (User) {
addField('lastonline');
}
<<<<<<< HEAD
db.getObjectsFields(keys, fields, function (err, users) {
if (err) {
return callback(err);
}
users = uids.map(function (uid) {
return users[ref[uid]];
});
modifyUserData(users, fieldsToRemove, callback);
});
=======
async.waterfall([
function (next) {
db.getObjectsFields(keys, fields, next);
db.getObjectsFields(keys, fields, function (err, users) {
if (err) {
return callback(err);
}
users = uids.map(function (uid) {
return users[ref[uid]];
});
next(null, users);
});
},
function (users, next) {
modifyUserData(users, fieldsToRemove, next);
},
], callback);
>>>>>>> master
};
User.getMultipleUserFields = function (uids, fields, callback) {
@@ -117,28 +113,24 @@ module.exports = function (User) {
return 'user:' + uid;
});
<<<<<<< HEAD
db.getObjects(keys, function (err, users) {
if (err) {
return callback(err);
}
users = uids.map(function (uid) {
return users[ref[uid]];
});
modifyUserData(users, [], callback);
});
=======
async.waterfall([
function (next) {
db.getObjects(keys, next);
db.getObjects(keys, function (err, users) {
if (err) {
return callback(err);
}
users = uids.map(function (uid) {
return users[ref[uid]];
});
next(null, users);
});
},
function (users, next) {
modifyUserData(users, [], next);
},
], callback);
>>>>>>> master
};
function modifyUserData(users, fieldsToRemove, callback) {