mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle unexpected os when loading yaml (#9790)

Browse Source
This commit is contained in:
Tony Murray
2019-02-06 14:24:39 -06:00
committed by GitHub
parent 61a48fbdd2
commit 8d3a3c9a3e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/common.php
View File

@ -1601,12 +1601,14 @@ function load_all_os($existing = false, $cached = true)
}
foreach ($os_list as $file) {
$tmp = Symfony\Component\Yaml\Yaml::parse(file_get_contents($file));
if (is_readable($file)) {
$tmp = Symfony\Component\Yaml\Yaml::parse(file_get_contents($file));
if (isset($config['os'][$tmp['os']])) {
$config['os'][$tmp['os']] = array_replace_recursive($tmp, $config['os'][$tmp['os']]);
} else {
$config['os'][$tmp['os']] = $tmp;
if (isset($config['os'][$tmp['os']])) {
$config['os'][$tmp['os']] = array_replace_recursive($tmp, $config['os'][$tmp['os']]);
} else {
$config['os'][$tmp['os']] = $tmp;
}
}
}
}