From 01cf034f8a7ac1d4b56f231b1e70147962d3a365 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 27 Apr 2017 14:34:21 +0200
Subject: [locationinfo] Regression: Fix editing location with no previous
 config

---
 modules-available/locationinfo/page.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules-available/locationinfo/page.inc.php')

diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index eb50193e..3562ccb3 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -545,7 +545,10 @@ class Page_LocationInfo extends Page
 	private function ajaxLoadLocationConfig($id)
 	{
 		// Get Config data from db
-		$location = Database::queryFirst("SELECT config, serverid, serverlocationid FROM `locationinfo_locationconfig` WHERE locationid = :id", array('id' => $id));
+		$location = Database::queryFirst("SELECT lc.config, lc.serverid, lc.serverlocationid
+			FROM location l
+			LEFT JOIN `locationinfo_locationconfig` lc USING (locationid)
+			WHERE l.locationid = :id", array('id' => $id));
 		if ($location === false) {
 			die("Invalid location id: $id");
 		}
-- 
cgit v1.2.3-55-g7522