Index: modules/eventrepeat/eventrepeat.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/eventrepeat/eventrepeat.module,v
retrieving revision 1.30
diff -u -F^f -r1.30 eventrepeat.module
--- modules/eventrepeat/eventrepeat.module	16 May 2006 00:24:23 -0000	1.30
+++ modules/eventrepeat/eventrepeat.module	6 Jun 2006 18:38:58 -0000
@@ -1543,6 +1543,15 @@ function _eventrepeat_render_nodes($rid 
         return db_num_rows($nodes_to_render) ? $nodes_to_render : NULL;
       }
 
+      // if organic group module is enabled let created nodes preserve groups
+      if ($repeat_data->og_groups && module_exist('og')) {
+        foreach ($repeat_data->og_groups as $key=>$val) {
+          unset($repeat_data->og_groups[$key]);
+          $repeat_data->og_groups[$val] = 1;
+          unset($repeat_data->og_groups[0]);
+        }
+      }
+      
       //here we begin looping through the possible nodes to render.  if we've reached the number of nodes to be
       //rendered in the remaining_COUNT field, then end the cycle
       while (($date_to_render = db_fetch_object($nodes_to_render)) && !$end_count) {
@@ -1767,6 +1776,13 @@ function _eventrepeat_update_nodes(&$nod
         $edited_node->body = $node->body;
         $edited_node->teaser = $node->teaser;
 
+        // preserves organic groups changes
+        if ($node->og_groups) {
+          $edited_node->og_public = $node->og_public;
+          $edited_node->og_groups = $node->og_groups;
+          $edited_node->og_groups_names = $node->og_groups_names;
+        }
+        
         //here we generate new start and end timestamps for the updated node, based on the date of the
         //node we're editing, and the start and end time of the node we updated.  this is done in case
         //the event start or end time was edited in the node we updated