From 42f87a1db7cb86a7417a12392f4911d0e5de0c79 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 26 Aug 2014 15:55:17 -0400
Subject: [PATCH] closes #2017

---
 src/user.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/user.js b/src/user.js
index 0919406089..7abee910cb 100644
--- a/src/user.js
+++ b/src/user.js
@@ -69,9 +69,8 @@ var
 			if (err) {
 				return callback(err);
 			}
-			plugins.fireHook('filter:user.removeFields', fieldsToRemove, function(err, fields) {
-				callback(err, modifyUserData(users, fields));
-			});
+
+			modifyUserData(users, fieldsToRemove, callback);
 		});
 	};
 
@@ -96,13 +95,11 @@ var
 				return callback(err);
 			}
 
-			plugins.fireHook('filter:user.removeFields', [], function(err, fields) {
-				callback(err, modifyUserData(users, fields));
-			});
+			modifyUserData(users, [], callback);
 		});
 	};
 
-	function modifyUserData(users, fieldsToRemove) {
+	function modifyUserData(users, fieldsToRemove, callback) {
 		users.forEach(function(user) {
 			if (!user) {
 				return;
@@ -132,7 +129,8 @@ var
 				user[fieldsToRemove[i]] = undefined;
 			}
 		});
-		return users;
+
+		plugins.fireHook('filter:users.get', users, callback);
 	}
 
 	User.updateLastOnlineTime = function(uid, callback) {