Merge branch 'master' into 0.7.0

Conflicts: src/user.js
2025-10-31 11:05:54 +01:00 · 2015-01-28 13:39:21 -05:00
parent 5a3c056759 63eeee4394
commit aabfeba38d
2 changed files with 5 additions and 2 deletions
--- a/src/user.js
+++ b/src/user.js
@@ -249,6 +249,7 @@ var	async = require('async'),
 					user.banned = parseInt(user.banned, 10) === 1;
 					user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
 				});
+
 				plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
 					if (err) {
 						return callback(err);