r1367: Set the default value for obsoletes to be no

diff --git a/admin/product.php b/admin/product.php
index d98a0d9b8f3b360e0d9b7632993bc546505e742f..cd78deaf8004e22ef8f0efe4d0f3a585bafb916c 100755 (executable)
--- a/admin/product.php
+++ b/admin/product.php
@@ -132,7 +132,7 @@ if ($_REQUEST['do'] == 'addversion')
        $admin->table_head(_('Add New Version'));
        $admin->row_input(_('Version Number<div><dfn>This is the version string for this product.</dfn></div>'), 'version');
        $admin->row_input(_('Display Order<div><dfn>The order in which the versions are displayed.</dfn></div>'), 'displayorder');
-       $admin->row_yesno(_('Obsolete<div><dfn>An obsolete version cannot have new bugs filed against it, but existing ones can be set to it.</dfn></div>'), 'obsolete');
+       $admin->row_yesno(_('Obsolete<div><dfn>An obsolete version cannot have new bugs filed against it, but existing ones can be set to it.</dfn></div>'), 'obsolete', false);
        $admin->row_submit();
        $admin->table_end();
        $admin->form_end();

diff --git a/includes/functions_product.php b/includes/functions_product.php
index a6ee0a664aefb21ffa78b7eb729cea4d62a92d19..19f2708e2c825f2c13470bff293047d456b3df6e 100644 (file)
--- a/includes/functions_product.php
+++ b/includes/functions_product.php
@@ -53,12 +53,18 @@ function ConstructProductSelect($action = 'canviewbugs', $select = null, $obsole
                        continue;
                }
                
-               $output .= ConstructOptionGroup($product['title'], ConstructVersionSelect($productid, $select, $obsolete));
+               if ($versions = ConstructVersionSelect($productid, $select, $obsolete))
+               {
+                       $output .= ConstructOptionGroup($product['title'], $versions);
+               }
                
                // these are components
-               foreach ($components["$productid"] AS $componentid => $component)
+               if ($components["$productid"])
                {
-                       $output .= ConstructOptionGroup($product['title'] . '/' . $component['title'], ConstructVersionSelect($componentid, $select, $obsolete));
+                       foreach ($components["$productid"] AS $componentid => $component)
+                       {
+                               $output .= ConstructOptionGroup($product['title'] . '/' . $component['title'], ConstructVersionSelect($componentid, $select, $obsolete));
+                       }
                }
        }