Index: subscriptions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions.module,v
retrieving revision 1.62.2.38
diff -u -r1.62.2.38 subscriptions.module
--- subscriptions.module	9 Mar 2007 21:19:49 -0000	1.62.2.38
+++ subscriptions.module	19 Aug 2007 23:46:19 -0000
@@ -53,8 +53,7 @@
         Subscriptions user menu, used to manage one\'s own subscriptions, under the \'My Account\' menu.  The default
         setting is ON.</p>
         <p>"<b>Set all users to \'autosubscribe\' by default</b>" set\'s the default value of the \'autosubscribe\'
-        option in each user\'s account to ON.  This value will not be set, however, until the user saves their
-        account preferences.  This, essentially, pre-checks the option associated with \'autosubscribe\'. The
+        option in each user\'s account to ON.  This, essentially, pre-checks the option associated with \'autosubscribe\'. The
         default value is OFF.</p>
 
       ');
@@ -593,7 +592,7 @@
 function subscriptions_autosubscribe($uid, $nid) {
   global $user;
   // if user has auto subscribe enabled
-  if ($user->subscriptions_auto) {
+  if ((isset($user->subscriptions_auto) && $user->subscriptions_auto) || (!isset($user->subscriptions_auto) && variable_get('subscriptions_autoset', 0))) {
     // check to see if already subscribed
     $result = db_query('SELECT sid FROM {subscriptions} WHERE sid = %d AND stype = \'node\' AND uid = %d', $nid, $uid);
     if (!db_num_rows($result)) {
@@ -889,7 +888,7 @@
 function subscriptions_form_alter($form_id, &$form) {
   global $user;
   $node = $form['#node'];
-  if ($user->uid && !$user->subscriptions_auto && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id && $form['#node']->comment == COMMENT_NODE_READ_WRITE) {
+  if ($user->uid && ((isset($user->subscriptions_auto) && !$user->subscriptions_auto) || (!isset($user->subscriptions_auto) && !variable_get('subscriptions_autoset', 0))) && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id && $form['#node']->comment == COMMENT_NODE_READ_WRITE) {
     $form['subscriptions'] = array(
       '#type'        => 'fieldset',
       '#title'       => t('Subscriptions'),