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

Revert "Stop flattening config options added in config.php" (#5492)

Browse Source
This commit is contained in:
Søren Rosiak
2017-01-17 19:42:48 +02:00
committed by GitHub
parent 977a7b6685
commit 292c4382c1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/common.php
View File

@@ -1523,10 +1523,9 @@ function load_os(&$device)
throw new Exception('No OS to load'); throw new Exception('No OS to load');
} }
$tmp_os = Symfony\Component\Yaml\Yaml::parse( $config['os'][$device['os']] = Symfony\Component\Yaml\Yaml::parse(
file_get_contents($config['install_dir'] . '/includes/definitions/' . $device['os'] . '.yaml') file_get_contents($config['install_dir'] . '/includes/definitions/' . $device['os'] . '.yaml')
); );
$config['os'][$device['os']] = array_replace_recursive($tmp_os, $config['os'][$device['os']]);
// Set type to a predefined type for the OS if it's not already set // Set type to a predefined type for the OS if it's not already set
if ($config['os'][$device['os']]['type'] != $device['type']) { if ($config['os'][$device['os']]['type'] != $device['type']) {
@@ -1556,7 +1555,7 @@ function load_all_os($restricted = array())
$tmp = Symfony\Component\Yaml\Yaml::parse( $tmp = Symfony\Component\Yaml\Yaml::parse(
file_get_contents($file) file_get_contents($file)
); );
$config['os'][$tmp['os']] = array_replace_recursive($tmp, $config['os'][$tmp['os']]); $config['os'][$tmp['os']] = $tmp;
} }
} }