diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 628726de0..ed64e7676 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -58,15 +58,13 @@ function parse_config() } } - // return config data as array, use old "listags" construction to mark certain elements as array (even if they're not recurring) $config=$cnf->toArray(listtags()); /* make alias table (for faster lookups) */ alias_make_table($config); - + return $config; - } /****f* config/convert_config diff --git a/src/www/system_routes.php b/src/www/system_routes.php index 494212d5a..379c9a7f4 100644 --- a/src/www/system_routes.php +++ b/src/www/system_routes.php @@ -32,8 +32,13 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -if (!is_array($config['staticroutes']['route'])) +if (!is_array($config['staticroutes'])) { + $config['staticroutes'] = array(); +} + +if (!is_array($config['staticroutes']['route'])) { $config['staticroutes']['route'] = array(); +} $a_routes = &$config['staticroutes']['route']; $a_gateways = return_gateways_array(true, true, true); diff --git a/src/www/system_routes_edit.php b/src/www/system_routes_edit.php index cc91432e7..2616fdaac 100644 --- a/src/www/system_routes_edit.php +++ b/src/www/system_routes_edit.php @@ -35,8 +35,13 @@ require_once("gwlb.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php'); -if (!is_array($config['staticroutes']['route'])) +if (!is_array($config['staticroutes'])) { + $config['staticroutes'] = array(); +} + +if (!is_array($config['staticroutes']['route'])) { $config['staticroutes']['route'] = array(); +} $a_routes = &$config['staticroutes']['route']; $a_gateways = return_gateways_array(true, true);