doing on master as well

src/controllers/users.js

@@ -44,9 +44,7 @@ usersController.getOnlineUsers = function(req, res, next) {
 			show_anon: anonymousUserCount ? '' : 'hide'
 		};
 
-		plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
+		res.render('users', userData);
-			res.render('users', userData.data);
-		});
 	});
 };
 
@@ -76,9 +74,7 @@ usersController.getUsers = function(set, count, req, res, next) {
 			show_anon: 'hide'
 		};
 
-		plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
+		res.render('users', userData);
-			res.render('users', userData.data);
-		});
 	});
 };
 
@@ -118,9 +114,7 @@ usersController.getUsersForSearch = function(req, res, next) {
 			show_anon: 'hide'
 		};
 
-		plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
+		res.render('users', userData);
-			res.render('users', userData.data);
-		});
 	});
 };
 

src/user.js

@@ -250,7 +250,13 @@ var	async = require('async'),
 					user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
 				});
 
-				callback(null, results.userData);
+				plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
+					if (err) {
+						return callback(err);
+					}
+
+					callback(null, data.users);
+				});
 			});
 		});
 	};