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

doing on master as well

Browse Source
This commit is contained in:
barisusakli
2015-01-28 10:30:18 -05:00
parent f253b11d71
commit 9db7f0f9a0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/users.js
View File

@@ -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.data);
});
res.render('users', userData);
});
};
@@ -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.data);
});
res.render('users', userData);
});
};
@@ -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.data);
});
res.render('users', userData);
});
};

8
src/user.js
View File

@@ -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);
});
});
});
};