From 648eb24336eadab055be07ca48da6d76b6882bc8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 24 Oct 2016 17:13:30 +0200
Subject: [sysconfig] Fix query when setting room config-module to "inherit"

---
 modules-available/sysconfig/page.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index 511cc3e4..e9fcdee9 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -348,8 +348,13 @@ class Page_SysConfig extends Page
 			}
 		}
 		$locationid = $this->currentLoc;
-		Database::exec("INSERT INTO configtgz_location (locationid, configid) VALUES (:locationid, :configid)"
-			. " ON DUPLICATE KEY UPDATE configid = :configid", compact('locationid', 'configid'));
+		if ($configid === 0) {
+			Database::exec("DELETE FROM configtgz_location WHERE locationid = :locationid",
+				compact('locationid'));
+		} else {
+			Database::exec("INSERT INTO configtgz_location (locationid, configid) VALUES (:locationid, :configid)"
+				. " ON DUPLICATE KEY UPDATE configid = :configid", compact('locationid', 'configid'));
+		}
 		Util::redirect('?do=sysconfig&locationid=' . $this->currentLoc);
 	}
 
-- 
cgit v1.2.3-55-g7522