Index: subscriptions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions.module,v
retrieving revision 1.89
diff -u -p -r1.89 subscriptions.module
--- subscriptions.module	26 Aug 2009 00:11:50 -0000	1.89
+++ subscriptions.module	9 Nov 2009 18:50:07 -0000
@@ -427,7 +427,7 @@ function subscriptions_autosubscribe($mo
   global $user;
   // if user has auto subscribe enabled and he's not already subscribed
   if ($user->uid && _subscriptions_get_setting('autosub_'. $context, $user) && !subscriptions_get_subscription($user->uid, $module, $field, $value)) {
-    subscriptions_write_subscription($module, $field, $value, -1, $user->uid, _subscriptions_get_setting('send_interval', $user), 1, 1);
+    subscriptions_write_subscription($module, $field, $value, -1, $user->uid, _subscriptions_get_setting('send_interval', $user), $context == 'on_update' ? 1 : 0, $context == 'on_comment' ? 1 : 0);
   }
 }
 
Index: subscriptions_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions_content.module,v
retrieving revision 1.42
diff -u -p -r1.42 subscriptions_content.module
--- subscriptions_content.module	3 Nov 2009 22:17:54 -0000	1.42
+++ subscriptions_content.module	9 Nov 2009 18:50:08 -0000
@@ -224,7 +224,10 @@ function subscriptions_content_nodeapi(&
       if ($node->uid > 0 && !$arg) {
         _subscriptions_content_autosubscribe($node->type, 'node', 'nid', $node->nid, ($op == 'insert' ? 'on_post' : 'on_update'));
       }
-
+      if ($node->uid > 0 && !$arg && $op == 'insert') {
+        // make sure that a node author gets subscribed on_comment if their settings are set that way
+        _subscriptions_content_autosubscribe($node->type, 'node', 'nid', $node->nid, 'on_comment');
+      }
       if (!isset($node->subscriptions_notify) || $node->subscriptions_notify) {
         subscriptions_queue($event);
       }