From 5b3cbbe4031b9747c350dc10428630f4b0546f79 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 17 Jan 2019 14:06:43 +0100
Subject: [serversetup-bwlp] Respect overriden default entry for location menu

---
 modules-available/serversetup-bwlp/inc/ipxemenu.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available')

diff --git a/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php
index 6429a2a7..5c1a87d5 100644
--- a/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php
+++ b/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php
@@ -82,7 +82,7 @@ class IPxeMenu
 			$chain = Location::getLocationRootChain($locationId);
 		}
 		if (!empty($chain)) {
-			$res = Database::simpleQuery("SELECT m.menuid, m.timeoutms, m.title, m.defaultentryid, ml.locationid
+			$res = Database::simpleQuery("SELECT m.menuid, m.timeoutms, m.title, IFNULL(ml.defaultentryid, m.defaultentryid) AS defaultentryid, ml.locationid
 			FROM serversetup_menu m
 			INNER JOIN serversetup_menu_location ml USING (menuid)
 			WHERE ml.locationid IN (:chain)", ['chain' => $chain]);
-- 
cgit v1.2.3-55-g7522