Index: nodeforum.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodeforum/nodeforum.module,v
retrieving revision 1.2.4.1
diff -u -p -r1.2.4.1 nodeforum.module
--- nodeforum.module	26 Aug 2008 17:44:55 -0000	1.2.4.1
+++ nodeforum.module	1 Oct 2008 14:15:04 -0000
@@ -512,7 +512,7 @@ function nodeforum_form_container($form_
     '#value' => _nodeforum_get_vid());
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Submit')
+    '#value' => t('Save configuration')
   );
   if ($edit['tid']) {
     $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
@@ -565,7 +565,7 @@ function nodeforum_form_nodeforum($form_
   );
 
   $form['vid'] = array('#type' => 'hidden', '#value' => _nodeforum_get_vid());
-  $form['submit' ] = array('#type' => 'submit', '#value' => t('Submit'));
+  $form['submit' ] = array('#type' => 'submit', '#value' => t('Save configuration'));
   if ($edit['tid']) {
     $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
     $form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']);
@@ -580,7 +580,6 @@ function nodeforum_form_nodeforum($form_
  */
 function nodeforum_form_submit($form, &$form_state) {
   $form_id = $form['form_id']['#value'];
-  $form_values = $form_state['values'];
   if ($form_id == 'nodeforum_form_container') {
     $container = TRUE;
     $type = t('forum container');
@@ -590,18 +589,18 @@ function nodeforum_form_submit($form, &$
     $type = t('forum');
   }
 
-  $status = taxonomy_save_term($form_values);
+  $status = taxonomy_save_term($form_state['values']);
   switch ($status) {
     case SAVED_NEW:
       if ($container) {
         $containers = variable_get('nodeforum_containers', array());
-        $containers[] = $form_values['tid'];
+        $containers[] = $form_state['values']['tid'];
         variable_set('nodeforum_containers', $containers);
       }
-      drupal_set_message(t('Created new @type %term.', array('%term' => $form_values['name'], '@type' => $type)));
+      drupal_set_message(t('Created new @type %term.', array('%term' => $form_state['values']['name'], '@type' => $type)));
       break;
     case SAVED_UPDATED:
-      drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_values['name'], '@type' => $type)));
+      drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_state['values']['name'], '@type' => $type)));
       break;
   }
   $form_state['redirect'] = 'admin/content/forum';
@@ -625,10 +624,9 @@ function nodeforum_confirm_delete($form_
  * Implementation of forms api _submit call. Deletes a forum after confirmation.
  */
 function nodeforum_confirm_delete_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  taxonomy_del_term($form_values['tid']);
-  drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => $form_values['name'])));
-  watchdog('content', t('forum: deleted %term and all its sub-forums and associated posts.', array('%term' => $form_values['name'])));
+  taxonomy_del_term($form_state['values']['tid']);
+  drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => $form_state['values']['name'])));
+  watchdog('content', t('forum: deleted %term and all its sub-forums and associated posts.', array('%term' => $form_state['values']['name'])));
 
   $form_state['redirect'] =  'admin/content/forum';
 }