### Eclipse Workspace Patch 1.0
#P uc_discounts_alt
Index: uc_discounts/uc_discounts.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_discounts_alt/uc_discounts/uc_discounts.module,v
retrieving revision 1.29.2.3
diff -u -r1.29.2.3 uc_discounts.module
--- uc_discounts/uc_discounts.module	2 Nov 2009 18:35:20 -0000	1.29.2.3
+++ uc_discounts/uc_discounts.module	5 Nov 2009 17:32:59 -0000
@@ -180,7 +180,7 @@
         //Add discount line items
         foreach ($arg1->uc_discounts_line_items as $line_item) {
           uc_order_line_item_add($arg1->order_id, $line_item["type"], $line_item["title"],
-            $line_item["amount"], $line_item["weight"]
+          $line_item["amount"], $line_item["weight"], $line_item["data"]
           );
           $new_order_line_items[] = $line_item;
         }
@@ -313,9 +313,13 @@
 
   //Calculate subtotal with discounts
   $subtotal = 0;
-  foreach ($items as $item) $subtotal += $item->price * $item->qty;
+  if (is_array($items)) {
+    foreach ($items as $item) $subtotal += $item->price * $item->qty;
+  }
   $total_discount_amount = 0;
-  foreach ($discounts as $discount) $total_discount_amount += $discount->amount;
+  if (is_array($discounts)) {
+    foreach ($discounts as $discount) $total_discount_amount += $discount->amount;
+  }
   $subtotal_including_discounts = $subtotal - $total_discount_amount;
 
   //Add total discount message
@@ -466,6 +470,7 @@
       "title" => $discount->short_description,
       "amount" => -$discount->amount,
       "weight" => LINE_ITEM_WEIGHT,
+    	"data" => array('discount_id' => $discount->discount_id),
     );
 
     $line_items[] = $line_item;
@@ -1647,9 +1652,10 @@
 		AND (%s)
 		AND (%s)
 		AND (%s)
+		AND (%s)
 		AND (d.has_expiration=0 OR d.expiration>%d)
 		ORDER BY d.%s %s", $roles_clause, $product_ids_clause, $term_ids_clause, $skus_clause, $classes_clause, time(),
-    $sort_column, $sort_order_string
+  $sort_column, $sort_order_string
   );
   uc_discounts_log("query=". $query);
   $result = db_query($query);