Index: workflow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow/workflow.module,v
retrieving revision 1.83.2.13
diff -u -p -r1.83.2.13 workflow.module
--- workflow.module	3 Mar 2010 18:17:02 -0000	1.83.2.13
+++ workflow.module	13 Mar 2010 19:31:21 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: workflow.module,v 1.83.2.13 2010/03/03 18:17:02 jvandyk Exp $
+// $Id: workflow.module,v 1.83.2.12 2010/03/02 22:20:46 jvandyk Exp $
 
 /**
  * @file
@@ -336,20 +336,20 @@ function workflow_transition($node, $sid
  * @param $choices
  *   An array of possible target states.
  */
-function workflow_node_form(&$form, $form_state, $title, $name, $current, $choices, $timestamp = NULL, $comment = NULL) {
+function workflow_node_form(&$form, $form_state, $name, $current, $choices, $timestamp = NULL, $comment = NULL) {
   // No sense displaying choices if there is only one choice.
   if (sizeof($choices) == 1) {
-    $form['workflow'][$name] = array(
+    $form['workflow']['workflow_choice'] = array(
       '#type' => 'hidden',
       '#value' => $current
     );
   }
   else {
-    $form['workflow'][$name] = array(
+    $form['workflow']['workflow_choice'] = array(
       '#type' => 'radios',
-      '#title' => $title,
+      '#title' => check_plain($name),
       '#options' => $choices,
-      '#name' => $name,
+      '#name' => check_plain($name),
       '#parents' => array('workflow'),
       '#default_value' => $current
     );
@@ -462,7 +462,7 @@ function workflow_form_alter(&$form, $fo
 
     $timestamp = NULL;
     $comment = '';
-    $name = '';
+    $name = $workflow->name;
 
     // See if scheduling information is present.
     if (isset($node->_workflow_scheduled_timestamp) && isset($node->_workflow_scheduled_sid)) {
@@ -476,7 +476,7 @@ function workflow_form_alter(&$form, $fo
       $comment = $form_state['values']['workflow_comment'];
     }
 
-    workflow_node_form($form, $form_state, $name, $name, $current, $choices, $timestamp, $comment);
+    workflow_node_form($form, $form_state, $name, $current, $choices, $timestamp, $comment);
   }
 }
 
Index: workflow.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow/workflow.pages.inc,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 workflow.pages.inc
--- workflow.pages.inc	16 Feb 2010 03:44:19 -0000	1.2.2.3
+++ workflow.pages.inc	13 Mar 2010 19:31:21 -0000
@@ -145,7 +145,7 @@ function workflow_tab_form($form_state, 
 
     // Include the same form elements here that are included on a
     // regular node editing page. $form is modified by reference.
-    workflow_node_form($form, $form_state, t('Change %s state', array('%s' => $name)), $name, $current, $choices, $timestamp, $comment);
+    workflow_node_form($form, $form_state, t('Change %s state', array('%s' => $name)), $current, $choices, $timestamp, $comment);
 
     $form['node'] = array(
       '#type' => 'value',