Index: /Users/jbitner/Sites/activity/sites/all/modules/contrib/activity/contrib/views_bookmarkactivity/views_bookmarkactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/views_bookmarkactivity/Attic/views_bookmarkactivity.module,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 views_bookmarkactivity.module --- views_bookmarkactivity.module 19 Feb 2008 14:20:51 -0000 1.1.2.4 +++ views_bookmarkactivity.module 19 Feb 2008 21:54:10 -0000 @@ -10,7 +10,7 @@ $types = views_bookmark_get_bookmarks(); foreach ($types as $type) { $token_types[$type->title] = $type->title; - } + } return array( 'ops' => array('mark' => t('Mark'), 'unmark' => t('Unmark')), 'types' => $token_types, @@ -32,7 +32,7 @@ * Token module integration. */ function views_bookmarkactivity_token_list($type = 'all') { - if ($type == 'nodeactivity') { + if ($type == 'views_bookmarkactivity') { $tokens['views_bookmarkactivity'] = array('node-id' => t('Id of the node that was bookmarked'), 'operation' => t('The verb of the operation that took place, eg. "mark", "unmark"'), 'author' => t('Person who bookmarked the node'), @@ -61,9 +61,8 @@ global $user; $args = func_get_args(); $node = node_load($args[3]); - $types = views_bookmark_get_types(); - $type = $types[$types->$arg[1]]->title; - dsm($types); + $types = views_bookmark_get_bookmarks(); + $type = $types[$args[1]]->title; $data = array( 'operation' => $args[0], 'node-id' => $node->nid, @@ -77,5 +76,5 @@ ACTIVITY_ALL => 'all', $node->uid => 'author' ); - activity_insert('views_bookmarkactivity', $type, $type, $data, $target_users_roles); + activity_insert('views_bookmarkactivity', $type, $args[0], $data, $target_users_roles); } \ No newline at end of file