From 738878b8b060b3cfcdde2d88a1a28d5ce83e4aa7 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 20:01:33 +0100
Subject: better handling for legacy config errors

---
 index.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 414dede..ef3944c 100644
--- a/index.php
+++ b/index.php
@@ -153,25 +153,23 @@ catch(Exception $e)
 }
 
 
-
 // PER-CONFERENCE CODE
-$conference = Conferences::getConference($mandator);
-
-// update template information
-$tpl->set(array(
-	'baseurl' => forceslash(baseurl()),
-	'route' => $route,
-	'canonicalurl' => joinpath([baseurl(), $mandator, $route]),
-	'conference_assets' => forceslash($mandator),
-
-	'conference' => $conference,
-	'feedback' => $conference->getFeedback(),
-	'schedule' => $conference->getSchedule(),
-	'subtitles' => $conference->getSubtitles(),
-));
-
 ob_start();
 try {
+	$conference = Conferences::getConference($mandator);
+
+	// update template information
+	$tpl->set(array(
+		'baseurl' => forceslash(baseurl()),
+		'route' => $route,
+		'canonicalurl' => joinpath([baseurl(), $mandator, $route]),
+		'conference_assets' => forceslash($mandator),
+
+		'conference' => $conference,
+		'feedback' => $conference->getFeedback(),
+		'schedule' => $conference->getSchedule(),
+		'subtitles' => $conference->getSubtitles(),
+	));
 
 	// ALWAYS AVAILABLE ROUTES
 	if($route == 'feedback/read')
-- 
cgit v1.2.3