Merge branch 'cherry-pick-688cec8f' into 'pandora_6.0'

Merge branch 'fixed-errors-in-net_tools-open' into 'develop'

See merge request !55
This commit is contained in:
vgilc 2017-01-19 13:27:38 +01:00
commit 80e8e4a35d
1 changed files with 2 additions and 1 deletions

View File

@ -292,7 +292,8 @@ function godmode_net_tools() {
else { else {
if (isset($config['network_tools_config'])) { if (isset($config['network_tools_config'])) {
$network_tools_config = json_decode($config['network_tools_config'], true); $network_tools_config_output = io_safe_output($config['network_tools_config']);
$network_tools_config = json_decode($network_tools_config_output, true);
$traceroute_path = $network_tools_config['traceroute_path']; $traceroute_path = $network_tools_config['traceroute_path'];
$ping_path = $network_tools_config['ping_path']; $ping_path = $network_tools_config['ping_path'];
$nmap_path = $network_tools_config['nmap_path']; $nmap_path = $network_tools_config['nmap_path'];