From 71f1f7137a12da29c59556e8225a310c42b71f70 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 16 Jan 2014 16:11:23 -0500
Subject: [PATCH] fixes

---
 src/socket.io/meta.js          | 10 +++++-----
 src/socket.io/notifications.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index 52cbae9f74..1b2f49b792 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -72,13 +72,13 @@ SocketMeta.rooms.enter = function(socket, data) {
 	}
 
 	socket.join(data.enter);
-	server.rooms[data.enter] = server.rooms[data.enter] || {};
+	socket.manager.rooms[data.enter] = socket.manager.rooms[data.enter] || {};
 
 	if (socket.uid) {
-		server.rooms[data.enter][socket.id] = socket.uid;
+		socket.manager.rooms[data.enter][socket.id] = socket.uid;
 
-		if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
-			delete server.rooms[data.leave][socket.id];
+		if (data.leave && socket.manager.rooms[data.leave] && socket.manager.rooms[data.leave][socket.id] && data.enter !== data.leave) {
+			delete socket.manager.rooms[data.leave][socket.id];
 		}
 	}
 
@@ -94,7 +94,7 @@ SocketMeta.rooms.enter = function(socket, data) {
 };
 
 SocketMeta.rooms.getAll = function(socket, data, callback) {
-	callback(server.manager.rooms);
+	callback(socket.manager.rooms);
 };
 
 /* Exports */
diff --git a/src/socket.io/notifications.js b/src/socket.io/notifications.js
index 995eb1826b..3c4d7c352a 100644
--- a/src/socket.io/notifications.js
+++ b/src/socket.io/notifications.js
@@ -8,7 +8,7 @@ SocketNotifs.get = function(socket, data, callback) {
 	});
 };
 
-SocketNotifs.getCount = function(socket, callback) {
+SocketNotifs.getCount = function(socket, data, callback) {
 	user.notifications.getUnreadCount(socket.uid, function(err, count) {
 		callback(err ? err.message : null, count);
 	});