=== modified file 'payment/uc_payment/uc_payment.admin.inc'
--- payment/uc_payment/uc_payment.admin.inc	2009-04-24 15:49:55 +0000
+++ payment/uc_payment/uc_payment.admin.inc	2009-05-06 18:27:07 +0000
@@ -300,9 +300,9 @@
   $context = array(
     'revision' => 'themed-original',
     'location' => 'order-payments-admin',
-    'subject' => array(
+    'subject' => array(),
+    'extras' => array(
       'order' => $order,
-      'total' => $total,
     ),
   );
   $form['order_total'] = array('#value' => uc_price($total, $context));

=== modified file 'shipping/uc_flatrate/uc_flatrate.admin.inc'
--- shipping/uc_flatrate/uc_flatrate.admin.inc	2009-04-24 15:49:55 +0000
+++ shipping/uc_flatrate/uc_flatrate.admin.inc	2009-05-06 18:27:07 +0000
@@ -15,6 +15,7 @@
 
   $context = array(
     'location' => 'shipping-flatrate-method-admin',
+    'subject' => array(),
   );
 
   $rows = array();

=== modified file 'shipping/uc_flatrate/uc_flatrate.module'
--- shipping/uc_flatrate/uc_flatrate.module	2009-04-18 01:05:58 +0000
+++ shipping/uc_flatrate/uc_flatrate.module	2009-05-06 18:27:07 +0000
@@ -58,6 +58,7 @@
     $context = array(
       'revision' => 'formatted',
       'location' => 'shipping-flatrate-method-node-form',
+      'subject' => array(),
     );
     while ($method = db_fetch_object($result)) {
       $context['subject']['flatrate_method'] = $method;
@@ -209,10 +210,12 @@
   $context = array(
     'revision' => 'altered',
     'location' => 'shipping-flatrate-method-json',
+    'subject' => array(),
+    'extras' => array(),
   );
 
   if ($method = db_fetch_object(db_query("SELECT * FROM {uc_flatrate_methods} WHERE mid = %d", $mid))) {
-    $context['subject']['flatrate_method'] = $method;
+    $context['extras']['flatrate_method'] = $method;
     // Start at the base rate.
     $rate = $method->base_rate;
 

=== modified file 'shipping/uc_quote/uc_quote.module'
--- shipping/uc_quote/uc_quote.module	2009-04-24 15:49:55 +0000
+++ shipping/uc_quote/uc_quote.module	2009-05-06 18:27:07 +0000
@@ -868,6 +868,7 @@
     case 'review':
       $context = array(
         'location' => 'shipping-quote-checkout-pane-review',
+        'subject' => array(),
       );
       $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = %d AND type = '%s'", $arg1->order_id, 'shipping');
       if ($line_item = db_fetch_object($result)) {

=== modified file 'shipping/uc_ups/uc_ups.module'
--- shipping/uc_ups/uc_ups.module	2009-05-01 18:25:18 +0000
+++ shipping/uc_ups/uc_ups.module	2009-05-06 18:27:07 +0000
@@ -836,6 +836,7 @@
   uasort($quotes, 'uc_quote_price_sort');
   $context = array(
     'location' => 'shipping-quote',
+    'subject' => array(),
   );
   foreach ($quotes as $key => $quote) {
     if (isset($quote['rate'])) {

=== modified file 'shipping/uc_usps/uc_usps.module'
--- shipping/uc_usps/uc_usps.module	2009-04-18 01:05:58 +0000
+++ shipping/uc_usps/uc_usps.module	2009-05-06 18:27:07 +0000
@@ -401,6 +401,7 @@
   }
   $context = array(
     'location' => 'shipping-usps-quote',
+    'subject' => array(),
   );
   foreach ($services as $key => $quote) {
     if (isset($quote['rate'])) {

=== modified file 'shipping/uc_weightquote/uc_weightquote.module'
--- shipping/uc_weightquote/uc_weightquote.module	2009-04-18 01:05:58 +0000
+++ shipping/uc_weightquote/uc_weightquote.module	2009-05-06 18:27:07 +0000
@@ -178,7 +178,8 @@
   $context = array(
     'revision' => 'altered',
     'location' => 'shipping-weightquote-quote',
-    'subject' => array(
+    'subject' => array(),
+    'extras' => array(
       'method' => $method,
     ),
   );

=== modified file 'uc_attribute/uc_attribute.admin.inc'
--- uc_attribute/uc_attribute.admin.inc	2009-04-30 13:16:02 +0000
+++ uc_attribute/uc_attribute.admin.inc	2009-05-06 18:27:07 +0000
@@ -476,8 +476,10 @@
       foreach ($attributes as $attribute) {
         $option = $attribute->options[$attribute->default_option];
         $context['subject'] = array(
+          'option' => $option,
+        );
+        $context['extras'] = array(
           'attribute' => $attribute,
-          'option' => $option,
         );
 
         $form['attributes'][$attribute->aid] = array(

=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module	2009-04-28 16:05:56 +0000
+++ uc_attribute/uc_attribute.module	2009-05-06 18:27:07 +0000
@@ -600,11 +600,12 @@
     'revision' => 'formatted',
     'location' => 'product-attribute-form-element',
     'subject' => array(),
+    'extras' => array(),
   );
 
   // Loop through each product attribute and generate its form element.
   foreach ($attributes as $attribute) {
-    $context['subject']['attribute'] = $attribute;
+    $context['extras']['attribute'] = $attribute;
     // Build the attribute's options array.
     $options = array();
     foreach ($attribute->options as $option) {

=== modified file 'uc_cart/uc_cart.pages.inc'
--- uc_cart/uc_cart.pages.inc	2009-04-29 13:35:56 +0000
+++ uc_cart/uc_cart.pages.inc	2009-05-06 18:27:07 +0000
@@ -211,6 +211,8 @@
     );
     $context['subject'] = array(
       'cart_item' => $item,
+    );
+    $context['extras'] = array(
       'node' => node_load($item->nid),
     );
 

=== modified file 'uc_cart/uc_cart_checkout_pane.inc'
--- uc_cart/uc_cart_checkout_pane.inc	2009-04-24 15:49:55 +0000
+++ uc_cart/uc_cart_checkout_pane.inc	2009-05-06 18:27:07 +0000
@@ -30,6 +30,7 @@
       $context = array(
         'location' => 'cart-review-item',
         'subject' => array(),
+        'extras' => array(),
       );
       foreach ($items as $item) {
         $desc = check_plain($item->title);
@@ -43,6 +44,8 @@
         );
         $context['subject'] = array(
           'cart_item' => $item,
+        );
+        $context['extras'] = array(
           'node' => node_load($item->nid),
         );
         $output .= '<tr valign="top"><td>'. $item->qty .'x</td><td width="100%">'. $desc
@@ -582,6 +585,8 @@
     );
     $context['subject'] = array(
       'cart_item' => $item,
+    );
+    $context['extras'] = array(
       'node' => node_load($item->nid),
     );
     $context['revision'] = 'altered';

=== modified file 'uc_order/uc_order.line_item.inc'
--- uc_order/uc_order.line_item.inc	2009-04-13 14:34:21 +0000
+++ uc_order/uc_order.line_item.inc	2009-05-06 18:27:07 +0000
@@ -36,6 +36,8 @@
         );
         $context['subject'] = array(
           'cart_item' => $item,
+        );
+        $context['extras'] = array(
           'node' => node_load($item->nid),
         );
         $total = uc_price($price_info, $context);

=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module	2009-04-28 16:24:01 +0000
+++ uc_order/uc_order.module	2009-05-06 18:27:07 +0000
@@ -373,8 +373,10 @@
               'revision' => 'formatted',
               'location' => 'order-subtotal-token',
               'subject' => array(
+                'line_item' => $order->line_items[$key],
+              ),
+              'extras' => array(
                 'order' => $order,
-                'line_item' => $order->line_items[$key],
               ),
             );
             $subtotal = uc_price($order->line_items[$key]['amount'], $context);
@@ -389,8 +391,10 @@
         'revision' => 'formatted-original',
         'location' => 'order-total-token',
         'subject' => array(
+          'field' => 'order_total',
+        ),
+        'extras' => array(
           'order' => $order,
-          'field' => 'order_total',
         ),
       );
       $values['order-total'] = uc_price($order->order_total, $context);

=== modified file 'uc_order/uc_order.order_pane.inc'
--- uc_order/uc_order.order_pane.inc	2009-04-23 04:35:51 +0000
+++ uc_order/uc_order.order_pane.inc	2009-05-06 18:27:07 +0000
@@ -333,7 +333,8 @@
 
       $context = array(
         'location' => 'order-line-items',
-        'subject' => array(
+        'subject' => array(),
+        'extras' => array(
           'order' => $arg1,
         ),
       );
@@ -404,7 +405,8 @@
 
       $context = array(
         'location' => 'order-edit-line-items',
-        'subject' => array(
+        'subject' => array(),
+        'extras' => array(
           'order' => $arg1,
         ),
       );

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-04-24 15:49:55 +0000
+++ uc_product/uc_product.module	2009-05-06 18:27:07 +0000
@@ -1104,6 +1104,8 @@
     'location' => 'cart-item',
     'subject' => array(
       'cart_item' => $item,
+    ),
+    'extras' => array(
       'node' => $node,
     ),
   );
@@ -1410,7 +1412,7 @@
  *
  * @param $price
  *   The amount to print.
- * @param $class
+ * @param $context
  *   Determines the label and the CSS class of the <div>.
  * @ingroup themeable
  */

=== modified file 'uc_product_kit/uc_product_kit.module'
--- uc_product_kit/uc_product_kit.module	2009-04-28 16:01:51 +0000
+++ uc_product_kit/uc_product_kit.module	2009-05-06 18:27:07 +0000
@@ -919,7 +919,24 @@
       $elements[$unique_id]['#extra'][] = array('data' => $item->qty .' x '. $title . $extra, 'class' => 'kit-component-cart-desc');
     }
 
-    $elements[$unique_id]['#total'] += $item->price * $item->qty;
+    $context = array(
+      'revision' => 'altered',
+      'location' => 'cart-item',
+      'subject' => array(
+        'cart_item' => $item,
+        'field' => 'price',
+      ),
+      'extras' => array(
+        'kit' => $kit,
+        'node' => $kit->products[$item->nid],
+      ),
+    );
+    $price_info = array(
+      'price' => $item->price,
+      'qty' => $item->qty,
+    );
+
+    $elements[$unique_id]['#total'] += uc_price($price_info, $context);
     $elements[$unique_id]['data'][$item->nid] = $item;
     $products[$unique_id][] = $item->nid;
 

=== modified file 'uc_taxes/uc_taxes.module'
--- uc_taxes/uc_taxes.module	2009-04-18 01:05:58 +0000
+++ uc_taxes/uc_taxes.module	2009-05-06 18:27:07 +0000
@@ -148,7 +148,8 @@
       $context = array(
         'revision' => 'formatted',
         'location' => 'tax-changes-log',
-        'subject' => array(
+        'subject' => array(),
+        'extras' => array(
           'order' => $arg1,
         ),
       );