### Eclipse Workspace Patch 1.0
#P workflow-cvs
Index: workflow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow/workflow.module,v
retrieving revision 1.54.2.34
diff -u -r1.54.2.34 workflow.module
--- workflow.module	19 Jul 2008 01:45:08 -0000	1.54.2.34
+++ workflow.module	26 May 2009 06:59:58 -0000
@@ -595,7 +595,9 @@
       $result = module_invoke_all('workflow', 'transition pre', $old_sid, $sid, $node);
       _workflow_write_history($node, $sid, $comment);
     }
-      $result = module_invoke_all('workflow', 'transition post', $old_sid, $sid, $node);
+    // Clear comment value so we don't save same comment more than once in subsequent nodeapi runs
+    unset($node->workflow_comment);
+    $result = module_invoke_all('workflow', 'transition post', $old_sid, $sid, $node);
     return;
   }
 
@@ -627,6 +629,8 @@
 
   // Change the state.
   _workflow_node_to_state($node, $sid, $comment);
+  // Clear comment value so we don't save same comment more than once in subsequent nodeapi runs
+  unset($node->workflow_comment);
   $node->_workflow = $sid;
 
   // Register state change with watchdog.