Merge remote-tracking branch 'origin/master' into category-whitelisting

This commit is contained in:
Julian Lam
2013-11-27 16:23:48 -05:00
7 changed files with 40 additions and 32 deletions

View File

@@ -316,8 +316,8 @@ var bcrypt = require('bcrypt'),
RDB.hset('user:' + uid, field, value, callback);
};
User.setUserFields = function(uid, data) {
RDB.hmset('user:' + uid, data);
User.setUserFields = function(uid, data, callback) {
RDB.hmset('user:' + uid, data, callback);
};
User.incrementUserFieldBy = function(uid, field, value, callback) {