From 1e64715b2d80c5c3950b55d1075c08fa5628b79b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 5 Mar 2019 11:57:45 +0100
Subject: [locations] Fix display with old serversetup module

---
 modules-available/locations/page.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/modules-available/locations/page.inc.php b/modules-available/locations/page.inc.php
index 2d8f5ff9..b1958cea 100644
--- a/modules-available/locations/page.inc.php
+++ b/modules-available/locations/page.inc.php
@@ -461,7 +461,7 @@ class Page_Locations extends Page
 			//$this->propagateFields($locationList, '', 'overriddenVars', 'overriddenClass');
 		}
 		// Show ipxe menu
-		if (Module::get('serversetup') !== false) {
+		if (Module::isAvailable('serversetup') && class_exists('IPxe')) {
 			$res = Database::simpleQuery("SELECT ml.locationid, m.title, ml.defaultentryid FROM serversetup_menu m
 				INNER JOIN serversetup_menu_location ml USING (menuid)
 				WHERE locationid IN (:allowedLocationIds) GROUP BY locationid", compact('allowedLocationIds'));
@@ -492,7 +492,7 @@ class Page_Locations extends Page
 			'havestatistics' => Module::get('statistics') !== false,
 			'havebaseconfig' => Module::get('baseconfig') !== false,
 			'havesysconfig' => Module::get('sysconfig') !== false,
-			'haveipxe' => Module::get('serversetup') !== false,
+			'haveipxe' => Module::isAvailable('serversetup') && class_exists('IPxe'),
 			'overlapSelf' => $overlapSelf,
 			'overlapOther' => $overlapOther,
 			'haveOverlapSelf' => !empty($overlapSelf),
-- 
cgit v1.2.3-55-g7522