From 7132a4692f9a490016b3cd6661027489e28624fe Mon Sep 17 00:00:00 2001
From: Maximilian Mader <maximilian.mader@gmx.de>
Date: Sun, 2 Mar 2014 18:11:54 +0100
Subject: [PATCH] Return roomID on join

---
 file/js/be.bastelstu.Chat.litcoffee     | 1 -
 file/lib/data/room/RoomAction.class.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index 50c2978..871e5ac 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -885,7 +885,6 @@ Joins a room.
 					loading = false
 					
 					roomList.active = data.returnValues
-					roomList.active.roomID = roomID
 					
 					$('#timsChatTopic').removeClass 'invisible'
 					
diff --git a/file/lib/data/room/RoomAction.class.php b/file/lib/data/room/RoomAction.class.php
index 1552fba..74bb0c9 100644
--- a/file/lib/data/room/RoomAction.class.php
+++ b/file/lib/data/room/RoomAction.class.php
@@ -262,6 +262,7 @@ public function join() {
 				'application' => 'chat',
 				'object' => $room
 			)),
+			'roomID' => (int) $room->roomID,
 			'userCount' => count($room->getUsers()),
 			'permissions' => array(
 				'canBan' => (boolean) $room->canBan(),