--- uc_product/uc_product.module (saved version)
+++ (current document)
@@ -403,15 +403,9 @@
  */
 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') {
-    $products = db_query("SELECT DISTINCT nid, type FROM {node} WHERE nid = %d", $args[0]->nid);
-
-    while ($product = db_fetch_object($products)) {
-      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');
-      }
-    }
+  if ($args[0]->nid) {
+    $forms['uc_product_add_to_cart_form_'. $args[0]->nid] = array('callback' => 'uc_product_add_to_cart_form');
+    $forms['uc_catalog_buy_it_now_form_'. $args[0]->nid] = array('callback' => 'uc_catalog_buy_it_now_form');
   }
   return $forms;
 }