diff options
| author | Simon Rettberg | 2019-01-17 14:06:43 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-01-17 14:06:43 +0100 |
| commit | 5b3cbbe4031b9747c350dc10428630f4b0546f79 (patch) | |
| tree | 8d6b2a3bc3fed2a3e58d01a017e4912c959376a7 /modules-available | |
| parent | Merge branch 'master' into ipxe (diff) | |
| download | slx-admin-5b3cbbe4031b9747c350dc10428630f4b0546f79.tar.gz slx-admin-5b3cbbe4031b9747c350dc10428630f4b0546f79.tar.xz slx-admin-5b3cbbe4031b9747c350dc10428630f4b0546f79.zip | |
[serversetup-bwlp] Respect overriden default entry for location menu
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/serversetup-bwlp/inc/ipxemenu.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
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]); |