From c78ab0bef60914b179cbe088b0f1e12ecaa70cf5 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 28 Mar 2019 13:12:35 +0100
Subject: [locationinfo] fix overrides reference is null error - the switch for
 activating override for a room is now working correctly

---
 modules-available/locationinfo/inc/locationinfo.inc.php                 | 1 +
 modules-available/locationinfo/templates/page-config-panel-default.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php
index 47872481..23a20a94 100644
--- a/modules-available/locationinfo/inc/locationinfo.inc.php
+++ b/modules-available/locationinfo/inc/locationinfo.inc.php
@@ -104,6 +104,7 @@ class LocationInfo
 				'calupdate' => 30,
 				'roomupdate' => 15,
 				'configupdate' => 180,
+				'overrides' => [],
 			);
 		}
 		if ($type === 'SUMMARY') {
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 9470efbb..2514ef93 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -549,7 +549,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	function unloadOverrideContent(id) {
 		var $panelBody = $('#overrideRoom' + id).find('div.panel-body');
 		$panelBody.find('div.list-group').remove();
-		delete overrides[id]
+		if (overrides !== null && overrides[id] !== undefined) delete overrides[id]
 	}
 
 	function delParent() {
-- 
cgit v1.2.3-55-g7522