Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix

public/src/forum/admin/index.js

@@ -25,7 +25,7 @@ define(function() {
 
 		for (var room in data) {
 			if (room !== '') {
-				var count = data[room].length;
+				var count = $(data[room]).length;
 				total += count;
 				active_users.innerHTML = active_users.innerHTML + "<div class='alert alert-success'><strong>" + room + "</strong> " + count + " active user" + (count > 1 ? "s" : "") + "</div>";
 			}

src/socket.io/meta.js

@@ -95,7 +95,7 @@ SocketMeta.rooms.enter = function(socket, data) {
 	module.parent.exports.updateRoomBrowsingText(data.enter);
 
 	if (data.enter != 'admin') {
-		server.in('admin').emit('event:meta.rooms.update', server.rooms);
+		server.in('admin').emit('event:meta.rooms.update', null, server.rooms);
 	}
 };