better handling for legacy config errors

1 files changed, 8 insertions, 2 deletions

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) {