Index: admin/product.php
===================================================================
--- admin/product.php	(revision 1255)
+++ admin/product.php	(working copy)
@@ -32,12 +32,10 @@
 	admin_login();
 }
 
-function construct_option_list($type, $id, $edit, $addcomponent, $addversion, $delete, $displayorder)
+function construct_option_list($type_display, $type, $id, $edit, $addcomponent, $addversion, $delete, $displayorder)
 {
 	global $bugsys;
 	
-	$type_display = $type;
-	$type = strtolower($type);
 	$type = ($type == 'component' ? 'product' : $type);
 	$type_action = (($type == 'version') ? 'versionid' : 'productid');
 	
@@ -383,10 +381,10 @@
 	// Handle our global versions
 	if (is_array($versions['0']))
 	{
-		$admin->row_text(_('Global Versions'), construct_option_list(_('Product'), -1, 0, 0, 1, 0, -1), 'middle', 2, 'alt3');
+		$admin->row_text(_('Global Versions'), construct_option_list(_('Product'), 'product', -1, 0, 0, 1, 0, -1), 'middle', 2, 'alt3');
 		foreach ($versions['0'] AS $version)
 		{
-			$admin->row_text('-- ' . $version['version'], construct_option_list(_('Version'), $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
+			$admin->row_text('-- ' . $version['version'], construct_option_list(_('Version'), 'version', $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
 		}
 	}
 	
@@ -394,14 +392,14 @@
 	foreach ($products AS $product)
 	{
 		// Product
-		$admin->row_text("<a href=\"product.php?do=editproduct&amp;productid=$product[productid]\">$product[title]</a>", construct_option_list(_('Product'), $product['productid'], 1, 1, 1, 1, $product['displayorder']), 'middle', 2, 'alt3');
+		$admin->row_text("<a href=\"product.php?do=editproduct&amp;productid=$product[productid]\">$product[title]</a>", construct_option_list(_('Product'), 'product', $product['productid'], 1, 1, 1, 1, $product['displayorder']), 'middle', 2, 'alt3');
 		
 		// Versions
 		if (is_array($versions["$product[productid]"]))
 		{
 			foreach ($versions["$product[productid]"] AS $version)
 			{
-				$admin->row_text('-- ' . $version['version'], construct_option_list(_('Version'), $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
+				$admin->row_text('-- ' . $version['version'], construct_option_list(_('Version'), 'version', $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
 			}
 		}
 		
@@ -410,14 +408,14 @@
 		{
 			foreach ($components["$product[productid]"] AS $comp)
 			{
-				$admin->row_text("-- <a href=\"product.php?do=editproduct&amp;productid=$comp[productid]\">$comp[title]</a>", construct_option_list(_('Component'), $comp['productid'], 1, 0, 1, 1, $comp['displayorder']), 'middle', 2, 'alt1');
+				$admin->row_text("-- <a href=\"product.php?do=editproduct&amp;productid=$comp[productid]\">$comp[title]</a>", construct_option_list(_('Component'), 'component', $comp['productid'], 1, 0, 1, 1, $comp['displayorder']), 'middle', 2, 'alt1');
 				
 				// Component versions
 				if (is_array($versions["$comp[productid]"]))
 				{
 					foreach ($versions["$comp[productid]"] AS $version)
 					{
-						$admin->row_text('---- ' . $version['version'], construct_option_list(_('Version'), $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
+						$admin->row_text('---- ' . $version['version'], construct_option_list(_('Version'), 'version', $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2');
 					}
 				}
 			}