Changeset 4624 for trunk/bp-members/bp-members-notifications.php

Timestamp:

07/07/2011 11:27:26 PM (13 years ago)

Author:

boonebgorges

Message:

Variable name cleanup to ensure that WP Admin Bar notification items get queued without overlapping each other. Fixes #3294

File:

• trunk/bp-members/bp-members-notifications.php (modified) (2 diffs)

trunk/bp-members/bp-members-notifications.php

@@ -57 +57 @@
     if ( empty( $grouped_notifications ) )
         return false;
-        
+    
+    $renderable = array();
+    
     // Calculate a renderable output for each notification type
     foreach ( (array)$grouped_notifications as $component_name => $action_arrays ) {
@@ -76 +78 @@
                     $content = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count, 'array' );
                     
+                    $notification_object = new stdClass;
+                    
                     // Minimal backpat with non-compatible notification
                     // callback functions
                     if ( is_string( $content ) ) {
-                        $notification->content = $content;
-                        $notification->href    = bp_loggedin_user_domain();
+                        $notification_object->content = $content;
+                        $notification_object->href    = bp_loggedin_user_domain();
                     } else {
-                        $notification->content = $content['text'];
-                        $notification->href    = $content['link'];
+                        $notification_object->content = $content['text'];
+                        $notification_object->href    = $content['link'];
                     }
                     
-                    $renderable[]          = $notification;
+                    $notification_object->id = $component_action_items[0]->id;
+                    
+                    $renderable[]     = $notification_object;
                 } else {
                     $content = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );