Index: uc_order/uc_order.order_pane.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/Attic/uc_order.order_pane.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 uc_order.order_pane.inc
--- uc_order/uc_order.order_pane.inc	19 Jan 2009 20:31:27 -0000	1.1.2.7
+++ uc_order/uc_order.order_pane.inc	5 Feb 2009 17:28:56 -0000
@@ -653,12 +653,6 @@ function uc_order_view_update_form_submi
       if (is_null($form_state['values']['order_comment']) || strlen($form_state['values']['order_comment']) == 0) {
         uc_order_comment_save($form_state['values']['order_id'], $user->uid, '-', 'order', $form_state['values']['status'], $form_state['values']['notify']);
       }
-      $order = uc_order_load($form_state['values']['order_id']);
-
-      // Let conditional actions send email if requested.
-      if ($form_state['values']['notify']) {
-        ca_pull_trigger('uc_order_status_email_update', $order);
-      }
     }
   }
 
@@ -669,7 +663,13 @@ function uc_order_view_update_form_submi
   if (!is_null($form_state['values']['admin_comment']) && strlen(trim($form_state['values']['admin_comment'])) > 0) {
     uc_order_comment_save($form_state['values']['order_id'], $user->uid, $form_state['values']['admin_comment']);
   }
-
+  
+  // Let conditional actions send email if requested.
+  if ($form_state['values']['notify']) {
+    $order = uc_order_load($form_state['values']['order_id']);
+    ca_pull_trigger('uc_order_status_email_update', $order);
+  }
+  
   drupal_set_message(t('Order updated.'));
 }