Index: activity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.module,v
retrieving revision 1.1.2.2.2.30.2.31.2.56
diff -u -p -r1.1.2.2.2.30.2.31.2.56 activity.module
--- activity.module	5 Oct 2009 00:00:20 -0000	1.1.2.2.2.30.2.31.2.56
+++ activity.module	14 Oct 2009 20:27:35 -0000
@@ -65,7 +65,7 @@ function comment_activity_info() {
   $info = _activity_activity_info();
   $info->name = 'comment';
   $info->object_type = 'comment';
-  $info->objects = array('comment author' => 'comment', 'node author' => 'node'); // array key is the label
+  $info->objects = array('comment author' => 'comment', 'node author' => 'node', 'comment author is the node author' => 'node_comment_author'); // array key is the label
   $info->hooks = array('comment' => array('insert', 'update'));
   $info->realms = array('comment' => 'Comment'); // do we need a t()?
   foreach (node_get_types() as $type) {
@@ -479,6 +479,8 @@ function activity_record($object, $conte
   if (!isset($types[$type]) && isset($context[$type])) {
     $types[$type] = $context[$type];
   }
+  
+  drupal_alter('activity_objects', $types);
 
   // check make sure we should record this activity
   // activity trigger modules can implement the hook_activity_type_check
Index: modules/comment.activity.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/modules/Attic/comment.activity.inc,v
retrieving revision 1.1.2.15
diff -u -p -r1.1.2.15 comment.activity.inc
--- modules/comment.activity.inc	22 Sep 2009 15:26:16 -0000	1.1.2.15
+++ modules/comment.activity.inc	14 Oct 2009 20:27:35 -0000
@@ -70,4 +70,15 @@ function comment_activity_token_values($
       'activity-comment-author-link' => theme('activity_username', $object),
     );
   }
+}
+
+/**
+ * Implementation of hook_activity_objects_alter().
+ */
+function comment_activity_objects_alter(&$objects) {
+  // if the comment and the node are the same author we
+  // have to allow that semantics
+  if ($objects['node']->uid == $objects['comment']->uid) {
+    $objects['node_comment_author'] = $objects['comment'];
+  }
 }
\ No newline at end of file