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

Timestamp:

07/06/2011 07:10:08 PM (13 years ago)

Author:

boonebgorges

Message:

Provides initial support for Notifications menu in WP Admin Bar. Refactors group and friendship notifications to return values compatible with the WP Admin Bar constructor. Modifies bp_core_get_notifications_for_user() in order to provide WP Admin Bar support in addition to BuddyBar backpat. References #3294

File:

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

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

@@ -44 +44 @@
 }
 
-function bp_core_get_notifications_for_user( $user_id ) {
+function bp_core_get_notifications_for_user( $user_id, $format = 'simple' ) {
     global $bp;
 
@@ -72 +72 @@
             if ( isset( $bp->{$component_name}->format_notification_function ) && function_exists( $bp->{$component_name}->format_notification_function ) ) {
                 $renderable[] = call_user_func( $bp->{$component_name}->format_notification_function, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
-            } elseif ( isset( $bp->{$component_name}->notification_callback ) && function_exists( $bp->{$component_name}->notification_callback ) ) {
-                $renderable[] = 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 );
+            } elseif ( isset( $bp->{$component_name}->notification_callback ) && function_exists( $bp->{$component_name}->notification_callback ) ) { 
+                if ( 'object' == $format ) {
+                    $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' );
+                    
+                    // Minimal backpat with non-compatible notification
+                    // callback functions
+                    if ( is_string( $content ) ) {
+                        $notification->content = $content;
+                        $notification->href    = bp_loggedin_user_domain();
+                    } else {
+                        $notification->content = $content['text'];
+                        $notification->href    = $content['link'];
+                    }
+                    
+                    $renderable[]          = $notification;
+                } 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 );
+                    $renderable[] = $content;
+                }
             }
         }