Index: simplenews_action/simplenews_action.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews_action/simplenews_action.module,v
retrieving revision 1.6.2.6
diff -u -p -r1.6.2.6 simplenews_action.module
--- simplenews_action/simplenews_action.module	20 Dec 2010 09:07:00 -0000	1.6.2.6
+++ simplenews_action/simplenews_action.module	22 Feb 2011 10:27:36 -0000
@@ -222,19 +222,16 @@ function simplenews_subscribe_user_actio
  * Implementation of a configurable Drupal action.
  */
 function simplenews_subscribe_user_action_form($context) {
-  if (!isset($context['newsletter'])) {
-    $context['newsletter'] = array();
-  }
-
   $tree = taxonomy_get_tree(variable_get('simplenews_vid', ''));
   $terms = array();
   foreach ($tree as $newsletter) {
     $terms[$newsletter->tid] = $newsletter->name;
   }
-  $form['newsletter'] = array(
+  $form['tid'] = array(
     '#title' => t('Newsletter'),
     '#type' => 'select',
     '#options' => $terms,
+    '#default_value' => isset($context['tid']) ? $context['tid'] : key($terms),
     '#description' => t('The newsletter series the user will be subscribed to.'),
   );
   return $form;
@@ -247,8 +244,8 @@ function simplenews_subscribe_user_actio
   $form_values = $form_state['values'];
 
   $params = array(
-    'tid' => $form_values['newsletter'],
-    'name' => $form['newsletter']['#options'][$form_values['newsletter']],
+    'tid' => $form_values['tid'],
+    'name' => $form['tid']['#options'][$form_values['tid']],
   );
   return $params;
 }
@@ -299,19 +296,16 @@ function simplenews_unsubscribe_user_act
  * Implementation of a configurable Drupal action.
  */
 function simplenews_unsubscribe_user_action_form($context) {
-  if (!isset($context['newsletter'])) {
-    $context['newsletter'] = array();
-  }
-
   $tree = taxonomy_get_tree(variable_get('simplenews_vid', ''));
   $terms = array();
   foreach ($tree as $newsletter) {
     $terms[$newsletter->tid] = $newsletter->name;
   }
-  $form['newsletter'] = array(
+  $form['tid'] = array(
     '#title' => t('Newsletter'),
     '#type' => 'select',
     '#options' => $terms,
+    '#default_value' => isset($context['tid']) ? $context['tid'] : key($terms),
     '#description' => t('The newsletter series the user will be unsubscribed from.'),
   );
   return $form;
@@ -324,8 +318,8 @@ function simplenews_unsubscribe_user_act
   $form_values = $form_state['values'];
 
   $params = array(
-    'tid' => $form_values['newsletter'],
-    'name' => $form['newsletter']['#options'][$form_values['newsletter']],
+    'tid' => $form_values['tid'],
+    'name' => $form['tid']['#options'][$form_values['tid']],
   );
   return $params;
 }