--- ./og_calendar.module	2008-11-28 14:43:54.000000000 +0100
+++ og_calendarNEW.module	2009-06-15 14:23:06.000000000 +0200
@@ -132,11 +132,14 @@ function og_calendar_page($group = NULL,
  * Implementation of hook_db_rewrite_sql().
  */
 function og_calendar_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
-  if ($args["event_get_events_event"] && $args["og_nid"]) {
-    $array = array();
-    $array['join'] = "JOIN {og_ancestry} og ON og.nid = n.nid";
-    $array['where'] = "group_nid = " .$args["og_nid"];
-    return $array; 
+  if ($args["event_get_events_upcoming"]) {
+    $group = og_get_group_context();
+    if(!empty($group)){
+      $array = array();
+      $array['join'] = "JOIN {og_ancestry} og ON og.nid = n.nid";
+      $array['where'] = "group_nid = " .$group->nid;
+      return $array;
+    }
   }
 }