? 171034_comment_notify_if_checked_require_email.patch
? 192325_comment_notify_permission_to_use.patch
? 229582_comment_notify_default_reg_off_help_setting_default.patch
? 232564_comment_notify_refactor_for_own_table_and_postgres.patch
? 232564_comment_notify_refactor_for_own_table_and_postgres_4.patch
? 264584_comment_notify_limit_node_types.patch
? 282201_comment_notify_one_mail_per_comment.patch
? comment_notify_token.patch
? cvs-release-notes.php
Index: comment_notify.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/comment_notify/comment_notify.module,v
retrieving revision 1.1.4.12
diff -u -p -r1.1.4.12 comment_notify.module
--- comment_notify.module	17 Jul 2008 20:41:42 -0000	1.1.4.12
+++ comment_notify.module	24 Jul 2008 16:45:18 -0000
@@ -78,18 +78,26 @@ function comment_notify_form_alter($form
     }
   }
 
-  if (($user->uid == 0) || (variable_get('comment_notify_regged_checkbox', TRUE))) {
+  if ($user->uid == 0) {
     $form['notify'] = array(
       '#type' => 'checkbox',
       '#title' => t('Notify me of follow-up comments posted here.'),
-      '#default_value' => ($user->uid != 0) ? $user->comment_notify_mailalert : variable_get('comment_notify_default_anon_mailalert', TRUE)
+      '#default_value' => ($user->uid != 0) ? $user->comment_notify_mailalert : variable_get('comment_notify_default_anon_mailalert', TRUE),
+    );
+  }
+  elseif (variable_get('comment_notify_regged_checkbox', TRUE)) {
+    $form['notify'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Notify me of follow-up comments posted here.'),
+      '#default_value' => ($user->uid != 0) ? $user->comment_notify_mailalert : variable_get('comment_notify_default_anon_mailalert', TRUE),
+      '#description' => t('You can change the default for this field in "Comment follow-up notification settings" on <a href="!uri">your account edit page</a>', array('!uri' => url('user/'. $user->uid .'/edit'))),
     );
   }
   else {
     $form['notify'] = array(
       '#type' => 'hidden',
       '#title' => t('Mail me updates to this comment.'),
-      '#default_value' => $user->comment_notify_mailalert
+      '#default_value' => $user->comment_notify_mailalert,
     );
   }
 
@@ -242,7 +250,7 @@ function comment_notify_user($type, &$ed
         $form['comment_notify_settings']['comment_notify_mailalert'] = array(
           '#type' => 'checkbox',
           '#title' => t('Receive comment follow-up notification e-mails'),
-          '#default_value' => isset($edit['comment_notify_mailalert']) ? $edit['comment_notify_mailalert'] : 1,
+          '#default_value' => isset($edit['comment_notify_mailalert']) ? $edit['comment_notify_mailalert'] : 0,
           '#description' => t('Check this box to receive e-mail notification for follow-up comments to comments you posted. You can later disable this on a post-by-post basis... so if you leave this to YES, you can still disable follow-up notifications for comments you don\'t want follow-up mails anymore - i.e. for very popular posts.')
         );