diff activity/activity.install activity-orig/activity.install
24,28d23
<       'gid' => array(
<         'type' => 'int',
<         'not null' => FALSE,
<         'default' => NULL,
<       ),
diff activity/activity.module activity-orig/activity.module
491,499d490
< 
<   if (module_exists('og')) {
<     $n = og_get_group_context();
<     $gid = $n->nid;
<   } else {
<     $gid = 'NULL';
<   }
< 
501c492
<   $result = db_query("SELECT COUNT(*) FROM {activity} WHERE uid = %d AND module = '%s' AND type = '%s' AND operation = '%s' AND data = '%s' AND created >= %d AND gid = %d", $uid, $module, $type, $operation, serialize($data), (time() - variable_get('activity_time_limit', 30)), $gid);
---
>   $result = db_query("SELECT COUNT(*) FROM {activity} WHERE uid = %d AND module = '%s' AND type = '%s' AND operation = '%s' AND data = '%s' AND created >= %d", $uid, $module, $type, $operation, serialize($data), (time() - variable_get('activity_time_limit', 30)));
507,509c498,500
<   db_query("INSERT INTO {activity} (uid, module,  type,  operation,  created, data,             gid)
<                             VALUES (%d,  '%s',    '%s',  '%s',       %d,      '%s',             %d)",
<                                    $uid, $module, $type, $operation, time(),  serialize($data), $gid);
---
>   db_query("INSERT INTO {activity} (uid, module,  type,  operation,  created, data)
>                             VALUES (%d,  '%s',    '%s',  '%s',       %d,      '%s')",
>                                    $uid, $module, $type, $operation, time(),  serialize($data));
516,519c507,510
<     'aid'     => $aid,
<     'uid'     => $uid,
<     'module'  => $module,
<     'type'    => $type,
---
>     'aid'     => $aid,
>     'uid'     => $uid,
>     'module'  => $module,
>     'type'    => $type,
521,522c512
<     'data'    => $data,
<     'gid'     => $gid,
---
>     'data'    => $data,
710,715c700,705
<     $row['data']['aid']     = $row['aid'];
<     $row['data']['uid']     = $row['uid'];
<     $row['data']['module']    = $row['module'];
<     $row['data']['type']    = $row['type'];
<     $row['data']['operation']   = ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
<     $row['data']['created']   = $row['created'];
---
>     $row['data']['aid']     = $row['aid'];
>     $row['data']['uid']     = $row['uid'];
>     $row['data']['module']    = $row['module'];
>     $row['data']['type']    = $row['type'];
>     $row['data']['operation']   = ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
>     $row['data']['created']   = $row['created'];
765c755
<   $a = array(
---
>   return array(
772,775d761
<   if (module_exists('og')) {
<     $a['activity.gid'] = array('field' => 'activity.gid', 'data' => t('Group Id'));
<   }
<   return $a;
789,792d774
<       if (module_exists('og')) {
<         $block['group']['info'] = t("Activity (Group): show activity of the current group");
<         $block['groupdetail']['info'] = t("Activity (Group) Detailed: show detailed activity of the current group");
<       }
882,926d863
<             
<           case 'group':
<             if (module_exists('og')) {
<               if (user_access('view public activity')) {
<                 $g = og_get_group_context();
<                 $activity =  activity_get_activity(ACTIVITY_ALL, array('gid' => array('include',$g->nid)), variable_get('activity_block_'. $delta, 5) + 1);
<                 if ($count = count($activity)) {
<                   drupal_add_css(drupal_get_path('module', 'activity') .'/activity.css');
<                   if ($count > variable_get('activity_block_'. $delta, 5)) {
<                     $more_link = theme('activity_more_link', 'activity');
<                     array_pop($activity);
<                   }
<                   $activities = array();
<                   foreach ($activity as $item) {
<                     $item['delete-link'] = activity_delete_link($item);
<                     $activities[] = theme('activity', activity_token_replace($item), $item);
<                   }
<                   return array(
<                     'subject' => t('Group activity'),
<                     'content' => theme('activity_block', $activities, $more_link)
<                   );
<                 }
<               }
<             }
<             break;
<             
<           case 'groupdetail':
<             if (module_exists('og')) {
<               if (user_access('view public activity')) {
<                 $g = og_get_group_context();
<                 $activities =  activity_get_activity(ACTIVITY_ALL, array('gid' => array('include',$g->nid)), variable_get('activity_block_'. $delta, 5) + 1);
<                 if ($count = count($activities)) {
<                   drupal_add_css(drupal_get_path('module', 'activity') .'/activity.css');
< 
<                   $table = theme('activity_table', $activities);
< 
<                   return array(
<                     'subject' => t('Group activity'),
<                     'content' => theme('activity_page', $activities, $table)
<                   );
<                 }
<               }
<             }
<             break;
<