Index: sites/all/modules/uc_gbase/uc_gbase.module
===================================================================
--- sites/all/modules/uc_gbase/uc_gbase.module	(Revision 509)
+++ sites/all/modules/uc_gbase/uc_gbase.module	(Arbeitskopie)
@@ -222,7 +222,7 @@
 
     $images_list = uc_gbase_get_images_list($form['field_image_cache']);
 
-    if ($form['type']['#value'] == 'product') {
+    if (uc_product_is_product_form($form)) {
 
     $form['uc_gbase'] = array(
       '#type' => 'fieldset',
@@ -355,7 +355,7 @@
 function uc_gbase_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
     case 'load':
-      if($node->type == 'product'){
+      if(uc_product_is_product($node)){
       $node->uc_gbase_id = uc_gbase_load($node->nid);
       $result = db_fetch_array(db_query('SELECT submit_type, product_name, product_type, product_description, product_condition, payment_method, images FROM {uc_gbase} WHERE nid = %d', $node->nid));
 
@@ -366,7 +366,7 @@
       break;
     case 'insert':
     case 'update':
-      if($node->type == 'product'){
+      if(uc_product_is_product($node)){
         $node->uc_gbase_id = uc_gbase_load($node->nid);
         $node->uc_gbase_id = uc_gbase_insert_item($node);
       }