aboutsummaryrefslogtreecommitdiff
path: root/template/overview.phtml
diff options
context:
space:
mode:
authorMaZderMind2016-12-18 13:34:57 +0100
committerMaZderMind2016-12-18 13:34:57 +0100
commita12d86ec058bc89e6feeda6ec8cfce691269b0a9 (patch)
tree6be1f764a8addd025eb774bcd2039788a4b1873f /template/overview.phtml
parent521f0e2e1c94538fdce65a021144180f368364d9 (diff)
parentefd0b59f8ed363e12211894d8892e4d18b198c04 (diff)
Merge branch 'master' into events/33c3
Diffstat (limited to 'template/overview.phtml')
-rw-r--r--template/overview.phtml5
1 files changed, 3 insertions, 2 deletions
diff --git a/template/overview.phtml b/template/overview.phtml
index c23320e..39cca02 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -78,15 +78,16 @@
</a>
<? if($room->hasSchedule()): ?>
+ <? $upcoming = @$upcomingTalksPerRoom[ $room->getScheduleName() ] ?: [] ?>
<div class="program-schedule">
<div class="talk current-talk">
<strong>Now:</strong>
- <span class="t">none</span>
+ <span class="t"><?=h(@$upcoming['current']['title'] ?: 'none') ?></span>
</div>
<div class="talk next-talk">
<strong>Next Talk:</strong>
- <span class="t">none</span>
+ <span class="t"><?=h(@$upcoming['next']['title'] ?: 'none') ?></span>
</div>
</div>
<? endif ?>