diff options
Diffstat (limited to 'modules-available')
-rw-r--r-- | modules-available/locations/page.inc.php | 4 | ||||
-rw-r--r-- | modules-available/locations/templates/locations.html | 2 |
2 files changed, 3 insertions, 3 deletions
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), diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 06d32020..038a69c8 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -22,7 +22,7 @@ </div> {{/overlapOther}} - <table class="table table-condensed locations" style="margin-bottom:0px"> + <table class="table table-condensed locations" style="margin-bottom:0"> <tr> <th width="100%">{{lang_locationName}}</th> <th> |