mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	pass uid to getUsers and getUsersFromSets
This commit is contained in:
		| @@ -219,18 +219,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) { | ||||
| @@ -264,7 +264,7 @@ 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); | ||||
| 					} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user