=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module	2010-01-25 16:37:01 +0000
+++ uc_attribute/uc_attribute.module	2010-07-09 17:02:39 +0000
@@ -712,6 +712,9 @@
 
   $context = array(
     'revision' => 'formatted',
+    'subject' => array(
+      'node' => $product,
+    ),
   );
 
   // Loop through each product attribute and generate its form element.
@@ -724,7 +727,6 @@
       switch (variable_get('uc_attribute_option_price_format', 'adjustment')) {
         case 'total':
           $context['type'] = 'product';
-          $context['subject']['node'] = $product;
           $price_info = array(
             'price' => $product->sell_price + $option->price,
             'qty' => $qty,