diff options
author | PiBa-NL <pba_2k3@yahoo.com> | 2017-03-26 16:23:30 +0200 |
---|---|---|
committer | PiBa-NL <pba_2k3@yahoo.com> | 2017-03-26 16:23:30 +0200 |
commit | bc0661b7b32a99016b9e71b0ece969f6584034c2 (patch) | |
tree | a7e96b9aa5638353ecac4e2c978cadb828a50b75 /src/usr | |
parent | dd844c430622fa68de1f868b62ec375d7131ce16 (diff) | |
download | pfsense-bc0661b7b32a99016b9e71b0ece969f6584034c2.zip pfsense-bc0661b7b32a99016b9e71b0ece969f6584034c2.tar.gz |
load package add-on tabs into config to avoid parsing all installed package xml's, fix tabgroup filter
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 43321d9..fb0134f 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -1091,13 +1091,14 @@ function add_package_tabs($tabgroup, &$tab_array) { } foreach ($config['installedpackages']['package'] as $pkg) { - $pkg_config = read_package_configurationfile($pkg['name']); - - if (!isset($pkg_config['tabs']['tab'])) { + if (!is_array($pkg['tabs']['tab'])) { continue; } - foreach ($pkg_config['tabs']['tab'] as $tab) { + foreach ($pkg['tabs']['tab'] as $tab) { + if ($tab['tabgroup'] != $tabgroup) { + continue; + } $tab_entry = array(); if ($tab['name']) { $tab_entry[] = $tab['name']; |