Index: activity.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/Attic/activity.admin.inc,v
retrieving revision 1.1.2.16
diff -u -p -b -r1.1.2.16 activity.admin.inc
--- activity.admin.inc	15 Jun 2009 22:58:41 -0000	1.1.2.16
+++ activity.admin.inc	14 Jul 2009 22:45:40 -0000
@@ -14,8 +14,9 @@ function activity_user_settings(&$form_s
     '#type' => 'fieldset',
     '#title' => t('Actions within !site', array('!site' => variable_get('site_name', 'drupal'))),
     '#description' => t('By default, all of the following actions you perform can be viewed on this site. <br />Select the activities you would like to <strong>exclude</strong> people from seeing.'),
-    '#tree' => TRUE,
   );
+  $form['actions']['activity_ignore']['#tree'] = TRUE;
+
   // In order to see what actions are being implemented on a given system we
   // need to query the actions table joining the trigger_assignments.
   $query = "SELECT a.aid, a.description, ta.hook, ta.op FROM {actions} a
@@ -32,10 +33,10 @@ function activity_user_settings(&$form_s
     // fine grained control over (i.e. I want to record my own node inserts but
     // not my node updates).
     $form['actions']['activity_ignore'][$row->hook .'_'. $row->op] = array(
-      '#type' => 'checkboxes',
+      '#type' => 'radios',
       '#title' => $description,
-      '#options' => array($row->hook .'_'. $row->op => t('Do not: !description', array('!description' => $row->description))),
-      '#default_value' => isset($account->activity_ignore[$row->hook .'_'. $row->op]) ? $account->activity_ignore[$row->hook .'_'. $row->op] : array(),
+      '#options' => array(1 => t('Record an activity message'), 0 => t('Do not record')),
+      '#default_value' => empty($account->activity_ignore[$row->hook .'_'. $row->op]) ? $account->activity_ignore[$row->hook .'_'. $row->op] : 1,
     );
   }
   $form['submit'] = array(
@@ -50,22 +51,7 @@ function activity_user_settings(&$form_s
  * User settings form submit handler.
  */
 function activity_user_settings_submit($form, &$form_state) {
-  $ignore = $form['#account']->activity_ignore;
-  $data = $form_state['values']['actions'];
-  // if the field is a module ignore field
-  if (!empty($data['activity_ignore'])) {
-    foreach ($data['activity_ignore'] as $value => $selected) {
-      if ($ignore[$value] != $selected) {
-        if ($selected != 0) {
-          $ignore[$value] = $selected;
-        }
-        else {
-          unset($ignore[$value]);
-        }
-      }
-    }
-  }
-  user_save($form['#account'], array('activity_ignore' => $ignore));
+  user_save($form['#account'], array('activity_ignore' => $form_state['values']['activity_ignore']));
 }
 
 /**