=== modified file 'uc_cart/uc_cart.ca.inc'
--- uc_cart/uc_cart.ca.inc	2009-04-06 16:50:01 +0000
+++ uc_cart/uc_cart.ca.inc	2009-04-27 19:16:07 +0000
@@ -79,7 +79,6 @@
           'subject' => t('Your Order at [store-name]'),
           'template' => 'customer',
           'view' => 'checkout-mail',
-          'format' => 1,
         ),
       ),
     ),
@@ -105,7 +104,6 @@
           'subject' => t('New Order at [store-name]'),
           'template' => 'admin',
           'view' => 'admin-mail',
-          'format' => 1,
         ),
       ),
     ),

=== modified file 'uc_order/uc_order.ca.inc'
--- uc_order/uc_order.ca.inc	2009-04-20 17:50:49 +0000
+++ uc_order/uc_order.ca.inc	2009-04-27 19:16:07 +0000
@@ -1136,9 +1136,6 @@
     '#required' => TRUE,
   );
 
-  // We add the #is_format element to allow us to locate and configure the filters.
-  $form['format'] = filter_form($settings['format']) + array('#is_format' => TRUE);
-
   $form['token_help'] = array(
     '#type' => 'fieldset',
     '#title' => t('Replacement patterns'),

=== modified file 'uc_order/uc_order.install'
--- uc_order/uc_order.install	2009-04-27 18:48:40 +0000
+++ uc_order/uc_order.install	2009-04-27 19:32:03 +0000
@@ -955,3 +955,29 @@
 
   return $ret;
 }
+
+function uc_order_update_6009() {
+  $ret = array();
+
+  $count = 0;
+  $result = db_query("SELECT pid, actions FROM {ca_predicates} WHERE actions LIKE '%%uc_order_email_invoice%%'");
+  while ($predicate = db_fetch_object($result)) {
+    $save = FALSE;
+    $actions = unserialize($predicate->actions);
+    foreach ($actions as $key => $action) {
+      if ($action['#name'] == 'uc_order_email_invoice') {
+        unset($actions[$key]['#settings']['format']);
+        $save = TRUE;
+      }
+    }
+    if ($save) {
+      db_query("UPDATE {ca_predicates} SET actions = '%s' WHERE pid = %d", serialize($actions), $predicate->pid);
+      $count++;
+    }
+  }
+
+  $t = get_t();
+  $ret[] = array('success' => TRUE, 'query' => $t('Fixed %count predicates with the action "uc_order_email_invoice".', array('%count' => $count)));
+
+  return $ret;
+}

=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module	2009-04-18 01:05:58 +0000
+++ uc_order/uc_order.module	2009-04-27 19:16:05 +0000
@@ -528,7 +528,9 @@
       // Strip newline characters from e-mail subjects.
       // TODO: Maybe drupal_mail_send() should do this? -LM
       $message['subject'] = str_replace(array("\r\n", "\r", "\n"), ' ', $subject);
-      $message['body'] = check_markup($body, $params['format'], FALSE);
+      if (isset($params['format'])) {
+        $message['body'] = check_markup($body, $params['format'], FALSE);
+      }
 
       break;
   }