From 9fbcedee3b1c8e629d92a3546bf79d81ec90dca3 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 19 Sep 2015 20:48:54 +0200 Subject: 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. --- usr/local/www/pkg_edit.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'usr') 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": -- cgit v1.1