diff --git a/src/socket.io/admin/rooms.js b/src/socket.io/admin/rooms.js index 618d5b9c0b..bf66873a52 100644 --- a/src/socket.io/admin/rooms.js +++ b/src/socket.io/admin/rooms.js @@ -79,8 +79,8 @@ SocketRooms.getAll = function(socket, data, callback) { totals.topics = {}; topTenTopics.forEach(function(topic, index) { totals.topics[topic.tid] = { - value: topic.count || 0, - title: validator.escape(titles[index].title) + value: topic.count || 0, + title: validator.escape(titles[index].title) }; }); diff --git a/src/upgrade.js b/src/upgrade.js index ad31e95e8e..4a03f458b0 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -536,7 +536,7 @@ Upgrade.upgrade = function(callback) { if (err) { return next(err); } - + if (!userData.picture || !userData.gravatarpicture) { return next(); } @@ -548,7 +548,7 @@ Upgrade.upgrade = function(callback) { }, function (next) { db.deleteObjectField('user:' + uid, 'gravatarpicture', next); - } + } ], next); } else { db.deleteObjectField('user:' + uid, 'gravatarpicture', next);