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

Merge branch '0.7.0'

Browse Source 
Conflicts:
	package.json
	src/search.js
This commit is contained in:
Julian Lam
2015-02-07 17:07:48 -05:00
parent 8bbd7d971b 59da48dee5
commit 957415463f
18 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/user.js
View File

@@ -221,18 +221,18 @@ var async = require('async'),
}
};
User.getUsersFromSet = function(set, start, stop, callback) {
User.getUsersFromSet = function(set, uid, start, stop, callback) {
async.waterfall([
function(next) {
User.getUidsFromSet(set, start, stop, next);
},
function(uids, next) {
User.getUsers(uids, next);
User.getUsers(uids, uid, next);
}
], callback);
};
User.getUsers = function(uids, callback) {
User.getUsers = function(uids, uid, callback) {
var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'postcount', 'reputation', 'email:confirmed'];
plugins.fireHook('filter:users.addFields', {fields: fields}, function(err, data) {
if (err) {
@@ -266,11 +266,10 @@ var async = require('async'),
user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
});
plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
plugins.fireHook('filter:userlist.get', {users: results.userData, uid: uid}, function(err, data) {
if (err) {
return callback(err);
}
callback(null, data.users);
});
});