diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-20 16:46:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-20 16:46:46 -0200 |
| commit | 6544cb185b84e535617d5b6c16bf1d2c57226cea (patch) | |
| tree | a44cd6448bbc81e11355716cfdb1897963c84de8 /src/usr/local/www/pkg_mgr.php | |
| parent | 7734024685c6097cbf2727dfaaa778798307ccbe (diff) | |
| download | pfsense-6544cb185b84e535617d5b6c16bf1d2c57226cea.zip pfsense-6544cb185b84e535617d5b6c16bf1d2c57226cea.tar.gz | |
Use new installed flag to simplify logic
Diffstat (limited to 'src/usr/local/www/pkg_mgr.php')
| -rw-r--r-- | src/usr/local/www/pkg_mgr.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index 1c1505e..f804723 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -160,8 +160,7 @@ if(!$pkg_info || !is_array($pkg_info)):?> }); foreach($pkg_info as $index): - - if(get_package_id($index['name']) >= 0 ) { + if (isset($index['installed'])) { continue; } @@ -172,15 +171,6 @@ if(!$pkg_info || !is_array($pkg_info)):?> continue; } - // Check to see if it is already installed - if(isset($config['installedpackages']['package'])) { - foreach($config['installedpackages']['package'] as $installedpkg) { - if($installedpkg['name'] == $shortname) { - continue(2); - } - } - } - ?> <tr> <td> |
