summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics/baseconfig
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available/statistics/baseconfig')
-rw-r--r--modules-available/statistics/baseconfig/getconfig.inc.php3
-rw-r--r--modules-available/statistics/baseconfig/hook.json2
2 files changed, 4 insertions, 1 deletions
diff --git a/modules-available/statistics/baseconfig/getconfig.inc.php b/modules-available/statistics/baseconfig/getconfig.inc.php
index ea351d15..053827db 100644
--- a/modules-available/statistics/baseconfig/getconfig.inc.php
+++ b/modules-available/statistics/baseconfig/getconfig.inc.php
@@ -8,6 +8,9 @@ if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'stri
}
}
+if (!$uuid) // Required at this point, bail out if not given
+ return;
+
// Query machine specific settings
$res = Database::simpleQuery("SELECT setting, value FROM setting_machine WHERE machineuuid = :uuid", ['uuid' => $uuid]);
while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
diff --git a/modules-available/statistics/baseconfig/hook.json b/modules-available/statistics/baseconfig/hook.json
index da28ad5d..4a406653 100644
--- a/modules-available/statistics/baseconfig/hook.json
+++ b/modules-available/statistics/baseconfig/hook.json
@@ -3,5 +3,5 @@
"field": "machineuuid",
"locationResolver": "StatisticsHooks::baseconfigLocationResolver",
"tostring": "StatisticsHooks::getBaseconfigName",
- "getfallback": "StatisticsHooks::getBaseconfigParent"
+ "getInheritance": "StatisticsHooks::baseconfigInheritance"
} \ No newline at end of file