diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index c4b447f7ca..1bcdac57bf 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -8,7 +8,7 @@ define(['notifications', 'chat'], function(Notifications, Chat) { Chat.prepareDOM(); translator.prepareDOM(); - function updateUnreadCount(count) { + function updateUnreadCount(err, count) { $('#unread-count').toggleClass('unread-count', count > 0); $('#unread-count').attr('data-content', count > 20 ? '20+' : count); } diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 611c71436f..28bc10a67b 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -83,7 +83,7 @@ define(function() { socket.on('user.isOnline', function(err, data) { if(getActiveSection() == 'online' && !loadingMoreUsers) { startLoading('users:online', 0, true); - socket.emit('user.getOnlineAnonCount', {} , function(anonCount) { + socket.emit('user.getOnlineAnonCount', {} , function(err, anonCount) { if(parseInt(anonCount, 10) > 0) { $('#users-container .anon-user').removeClass('hide'); $('#online_anon_count').html(anonCount); diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 1237f418b9..b629d1a648 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -117,12 +117,12 @@ SocketUser.getOnlineUsers = function(socket, data, callback) { }; SocketUser.getOnlineAnonCount = function(socket, data, callback) { - callback(module.parent.exports.getOnlineAnonCount()); + callback(null, module.parent.exports.getOnlineAnonCount()); }; SocketUser.getUnreadCount = function(socket, data, callback) { topics.getUnreadTids(socket.uid, 0, 19, function(err, tids) { - callback(tids.length); + callback(err, tids?tids.length:0); }); }; @@ -135,13 +135,13 @@ SocketUser.loadMore = function(socket, data, callback) { end = start + 19; user.getUsers(data.set, start, end, function(err, data) { - if (err) { - winston.err(err); - } else { - callback({ - users: data - }); + if(err) { + return callback(err); } + + callback(null, { + users: data + }); }); };