Changeset 7652

Timestamp:

12/07/2013 09:27:45 PM (13 years ago)

Author:

r-a-y

Message:

Groups: Fix invalid arguments for new notification function calls.

See #5266, #5282.

Props imath.

File:

• trunk/bp-groups/bp-groups-notifications.php (modified) (5 diffs)

trunk/bp-groups/bp-groups-notifications.php

@@ -60 +60 @@
 
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
+                bp_notifications_add_notification( array(
+                        'user_id'           => $admin_id,
+                        'item_id'           => $requesting_user_id,
+                        'secondary_item_id' => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => 'new_membership_request'
+                ) );
         }
 
@@ -111 +117 @@
         // Post a screen notification first.
         if ( bp_is_active( 'notifications' ) ) {
-                if ( $accepted ) {
-                        bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_accepted' );
-                } else {
-                        bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
-                }
+
+                $type = ! empty( $accepted ) ? 'membership_request_accepted' : 'membership_request_rejected' ;
+
+                bp_notifications_add_notification( array(
+                        'user_id'           => $requesting_user_id,
+                        'item_id'           => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => $type
+                ) );
         }
 
@@ -182 +192 @@
         // Post a screen notification first.
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_add_notification( $group_id, $user_id, 'groups', $type );
+                bp_notifications_add_notification( array(
+                        'user_id'           => $user_id,
+                        'item_id'           => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => $type,
+                        'date_notified'     => bp_core_current_time(),
+                        'is_new'            => 1,
+                ) );
         }
 
@@ -235 +252 @@
                 // Post a screen notification first.
                 if ( bp_is_active( 'notifications' ) ) {
-                        bp_notifications_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
+                        bp_notifications_add_notification( array(
+                                'user_id'           => $invited_user_id,
+                                'item_id'           => $group->id,
+                                'component_name'    => buddypress()->groups->id,
+                                'component_action'  => 'group_invite'
+                        ) );
                 }
 
@@ -593 +615 @@
 function bp_groups_screen_group_admin_requests_mark_notifications( $group_id ) {
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), $group_id, 'new_membership_request' );
+                bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->groups->id, 'new_membership_request' );
         }
 }