diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2017-03-26 16:23:30 +0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-29 08:22:14 -0300 |
| commit | 2b1a4a895b4057de198957cb2550cb5edc5ea040 (patch) | |
| tree | 3735d2977a948a09d17db3cfddf0c290b0e5b5c9 /src/usr/local/www/guiconfig.inc | |
| parent | ea846d7848ec0c6f4d29855207a61715adb55988 (diff) | |
| download | pfsense-2b1a4a895b4057de198957cb2550cb5edc5ea040.zip pfsense-2b1a4a895b4057de198957cb2550cb5edc5ea040.tar.gz | |
load package add-on tabs into config to avoid parsing all installed package xml's, fix tabgroup filter
(cherry picked from commit bc0661b7b32a99016b9e71b0ece969f6584034c2)
Diffstat (limited to 'src/usr/local/www/guiconfig.inc')
| -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 869c5dd..b2d88d5 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -1078,13 +1078,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']; |
