Merge branch 'master' into events/33c3

1 files changed, 2 insertions, 2 deletions

diff --git a/view/room.php b/view/room.php
index 505be95..d586248 100644
--- a/view/room.php
+++ b/view/room.php
@@ -1,6 +1,6 @@
 <?php
 
-$room = new Room($_GET['room']);
+$room = $conference->getRoom($_GET['room']);
 $stream = $room->selectStream(
 	$_GET['selection'], $_GET['language']);
 
@@ -11,5 +11,5 @@ echo $tpl->render(array(
 	'room' => $room,
 	'stream' => $stream,
 
-	'schedule' => new Schedule(),
+	'schedule' => $conference->getSchedule(),
 ));