diff options
| author | doktornotor <notordoktor@gmail.com> | 2015-09-19 20:48:54 +0200 |
|---|---|---|
| committer | doktornotor <notordoktor@gmail.com> | 2015-09-19 20:48:54 +0200 |
| commit | 9fbcedee3b1c8e629d92a3546bf79d81ec90dca3 (patch) | |
| tree | 2cb1fefb6518a8ae76b15620dd217505496d9506 /usr | |
| parent | f70b256ed5d68d70b8fb22ac2e64b2797488394c (diff) | |
| download | pfsense-9fbcedee3b1c8e629d92a3546bf79d81ec90dca3.zip pfsense-9fbcedee3b1c8e629d92a3546bf79d81ec90dca3.tar.gz | |
pkg_edit.php - fix issue where default value was not being populated for newly added fields
Backport from PR #1906 / PR #1787 for RELENG_2_2.
Check if the actual $fieldname element is present in the $a_pkg[$id] array before trying to assign its value. Do same with default_value. Fixes issue where default value was not being populated for newly added fields.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/pkg_edit.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index ad56f5a..376cd8a 100644 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -539,10 +539,13 @@ if ($pkg['tabs'] <> "") { $value = $_POST[$fieldname]; if (is_array($value)) $value = implode(',', $value); } else { - if (isset($id) && $a_pkg[$id]) + if (isset($id) && isset($a_pkg[$id][$fieldname])) { $value = $a_pkg[$id][$fieldname]; - else - $value = $pkga['default_value']; + } else { + if (isset($pkga['default_value'])) { + $value = $pkga['default_value']; + } + } } switch($pkga['type']){ case "input": |
