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

---
 model/Conferences.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'model/Conferences.php')

diff --git a/model/Conferences.php b/model/Conferences.php
index 77069ad..2dc9f35 100644
--- a/model/Conferences.php
+++ b/model/Conferences.php
@@ -73,8 +73,14 @@ class Conferences
 	}
 
 	public static function loadConferenceConfig($mandator) {
-		$config = forceslash(Conferences::MANDATOR_DIR).forceslash($mandator).'config.php';
-		return include($config);
+		$configfile = forceslash(Conferences::MANDATOR_DIR).forceslash($mandator).'config.php';
+		$config = include($configfile);
+
+		if(!is_array($config)) {
+			throw new ConfigException("Loading $configfile did not return an array. Maybe it's missing a return-statement?");
+		}
+
+		return $config;
 	}
 
 	public static function getConference($mandator) {
-- 
cgit v1.2.3