Index: uc_attribute/uc_attribute.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_attribute/uc_attribute.module,v
retrieving revision 1.12.2.27
diff -u -p -r1.12.2.27 uc_attribute.module
--- uc_attribute/uc_attribute.module	28 May 2009 20:49:19 -0000	1.12.2.27
+++ uc_attribute/uc_attribute.module	1 Jun 2009 23:18:27 -0000
@@ -295,7 +295,7 @@ function uc_attribute_nodeapi(&$node, $o
       case 'load':
         $attributes = uc_product_get_attributes($node->nid);
         if (is_array($attributes) && !empty($attributes)) {
-          $node->attributes = $attributes;
+          $node->uc_attributes = $attributes;
           return array('attributes' => $attributes);
         }
         break;
@@ -554,7 +554,7 @@ function _uc_cart_product_get_options($i
   $index = 0;
   if (!empty($data['attributes']) && is_array($data['attributes'])) {
     foreach ($data['attributes'] as $aid => $selected) {
-      $attribute = $node->attributes[$aid];
+      $attribute = $node->uc_attributes[$aid];
       // Only discrete options can affect the price of an item.
       if ($attribute->display && count($attribute->options)) {
         // There may be many selected options, or just one.
@@ -591,10 +591,10 @@ function _uc_cart_product_get_options($i
  */
 function _uc_attribute_alter_form($product) {
   // If the product doesn't have attributes, return the form as it is.
-  if (!isset($product->attributes)) {
-    $product->attributes = uc_product_get_attributes($product->nid);
+  if (!isset($product->uc_attributes)) {
+    $product->uc_attributes = uc_product_get_attributes($product->nid);
   }
-  if (!is_array($product->attributes) || empty($product->attributes)) {
+  if (!is_array($product->uc_attributes) || empty($product->uc_attributes)) {
     return NULL;
   }
 
@@ -606,7 +606,7 @@ function _uc_attribute_alter_form($produ
 
   // Load all product attributes for the given nid.
   $priced_attributes = uc_attribute_priced_attributes($nid);
-  $attributes = $product->attributes;
+  $attributes = $product->uc_attributes;
 
   $form_attributes = array();