From f499d4d53a31011d523d8ebaf8c4f7f0fcea43b7 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 20:36:46 +0100
Subject: repair schedule view

---
 model/Schedule.php                 | 13 +++----------
 template/assemblies/schedule.phtml |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/model/Schedule.php b/model/Schedule.php
index 0b789f2..eb9fe05 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -54,16 +54,9 @@ class Schedule
 	public function getSchedule()
 	{
 		// download schedule-xml
-		try
-		{
-			$schedule = $this->fetchSchedule();
-		}
-		catch(Exception $e)
-		{
-			return array('_error' => (string)$e);
-		}
+		$schedule = $this->fetchSchedule();
 
-		$mapping = $this->getConference()->getScheduleToRoomSlugMapping();
+		$mapping = $this->getScheduleToRoomSlugMapping();
 		$program = array();
 
 		// re-calculate day-ends
@@ -257,7 +250,7 @@ class Schedule
 	public function getDurationSum()
 	{
 		$sum = 0;
-		$schedule = $this->getConference()->getSchedule();
+		$schedule = $this->getSchedule();
 		foreach(reset($schedule) as $event)
 			$sum += $event['duration'];
 
diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
index b804196..90ec1b9 100644
--- a/template/assemblies/schedule.phtml
+++ b/template/assemblies/schedule.phtml
@@ -13,7 +13,7 @@
 						data-end="<?=intval($event['end'])?>"
 					>
 						<? $fromstart += $event['duration'] ?>
-						<? $scheduleRoom = Room::createIfExists($roomname) ?>
+						<? $scheduleRoom = $conference->getRoomIfExists($roomname) ?>
 						<? if($scheduleRoom): ?>
 							<a
 								class="inner"
-- 
cgit v1.2.3