? og_move_add_to_add.patch
? po
? views
? modules/og_panels/translations
? modules/og_panels/plugins/task_handlers
? og_actions/translations
? og_notifications/po
? og_notifications/translations
? og_views/includes
? og_views/translations
? og_views/views
Index: modules/og_notifications/og_notifications.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_notifications/Attic/og_notifications.module,v
retrieving revision 1.24.4.23
diff -u -p -r1.24.4.23 og_notifications.module
--- modules/og_notifications/og_notifications.module	19 Aug 2009 07:48:22 -0000	1.24.4.23
+++ modules/og_notifications/og_notifications.module	3 Feb 2010 17:45:35 -0000
@@ -285,10 +285,17 @@ function og_notifications_message_alter(
     $text = array(
       'subject' => messaging_message_part($group, 'subject', $send_method, $event),
       'header' => messaging_message_part($group, 'header', $send_method, $event),
-      'main'  => messaging_message_part($group, 'main', $send_method, $event),
       'footer' => messaging_message_part($group, 'footer', $send_method, $event)
     );
 
+    if (isset($message->body['main']) ) {
+      $text['main'] = messaging_message_part($group, 'main', $send_method, $event);
+    }
+    else {
+      $text['event'] = messaging_message_part($group, 'main', $send_method, $event);
+    }
+
+
     $objects = array('user' => $message->account, 'node' => $event->objects['node'], 'subscription' => $subscription);
     if ($event->action == 'comment') {
       $objects['comment'] = $event->objects['comment'];
@@ -299,7 +306,7 @@ function og_notifications_message_alter(
 
     $message->subject = $text['subject'];
     unset($text['subject']);
-    $message->body = $text;
+    $message->body = array_merge($message->body,$text);
   }
 }
 
@@ -550,7 +557,13 @@ function _og_notification_check_message(
     // Check if "group" is one of the fields. This is a general presumption
     // that any subscription with at least two fields, one of them being a
     // group, is an OG subscription.
-    $sid = db_result(db_query("SELECT sid FROM {notifications} WHERE type = 'grouptype' AND sid = %d", $params[0]));
+    foreach ($params as $current_sid) {
+      $sid = db_result(db_query("SELECT sid FROM {notifications} WHERE type = 'grouptype' AND sid = %d", $current_sid));
+      if ($sid) {
+        break;
+      }
+    }
+
   }
 
   return $sid > 0 ? $sid : 0;