=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-02-03 14:32:57 +0000
+++ uc_product/uc_product.module	2009-02-05 13:52:50 +0000
@@ -404,12 +404,10 @@
  */
 function uc_product_forms($form_id, $args) {
   $forms = array();
-  if (substr($form_id, 0, 27) == 'uc_product_add_to_cart_form' || substr($form_id, 0, 26) == 'uc_catalog_buy_it_now_form') {
-    $product = $args[0];
-    if (in_array($product->type, array_keys(uc_product_node_info()))) {
-      $forms['uc_product_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_add_to_cart_form');
-      $forms['uc_catalog_buy_it_now_form_'. $product->nid] = array('callback' => 'uc_catalog_buy_it_now_form');
-    }
+  $product = $args[0];
+  if (in_array($product->type, array_keys(uc_product_node_info()))) {
+    $forms['uc_product_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_add_to_cart_form');
+    $forms['uc_catalog_buy_it_now_form_'. $product->nid] = array('callback' => 'uc_catalog_buy_it_now_form');
   }
   return $forms;
 }
@@ -1175,7 +1173,7 @@
     'weight' => 0,
     'cell' => array('data' => t('Name'), 'field' => 'n.title'),
   );
-  
+
   if ($enabled['list_price']) {
     $columns['list_price'] = array(
       'weight' => 3,
@@ -1240,7 +1238,7 @@
     if ($enabled['sell_price']) {
       $data['price'] = array('#value' => theme('uc_product_sell_price', $node->sell_price, TRUE), '#cell_attriubtes' => array('nowrap' => 'nowrap'));
     }
-    
+
     if (module_exists('uc_cart') && arg(0) != 'admin' && $enabled['add_to_cart']) {
       $data['add_to_cart'] = array('#value' => drupal_get_form('uc_catalog_buy_it_now_form_'. $node->nid, $node));
     }
@@ -1467,7 +1465,7 @@
   $image_defaults = array('filepath' => '','alt' => '','title' => '');
 
   $first = array_merge($image_defaults, array_shift($images));
-  
+
   $output = '<div class="product-image">';
   if ($image_widget) {
     $output .= '<a href="'. check_url(file_create_url($first['filepath'])) .'" title="'. $first['title'] .'"'. $image_widget_func($rel_count) .'>';

=== modified file 'uc_product_kit/uc_product_kit.module'
--- uc_product_kit/uc_product_kit.module	2009-01-30 19:45:32 +0000
+++ uc_product_kit/uc_product_kit.module	2009-02-05 13:53:09 +0000
@@ -288,13 +288,11 @@
  */
 function uc_product_kit_forms($form_id, $args) {
   $forms = array();
-  if (substr($form_id, 0, 31) == 'uc_product_kit_add_to_cart_form' || substr($form_id, 0, 27) == 'uc_product_add_to_cart_form' || substr($form_id, 0, 26) == 'uc_catalog_buy_it_now_form') {
-    $product = $args[0];
-    if ($product->type == 'product_kit') {
-      $forms['uc_product_kit_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
-      $forms['uc_product_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
-      $forms['uc_catalog_buy_it_now_form_'. $product->nid] = array('callback' => 'uc_product_kit_buy_it_now_form');
-    }
+  $product = $args[0];
+  if ($product->type == 'product_kit') {
+    $forms['uc_product_kit_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
+    $forms['uc_product_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
+    $forms['uc_catalog_buy_it_now_form_'. $product->nid] = array('callback' => 'uc_product_kit_buy_it_now_form');
   }
   return $forms;
 }