Changeset 4621

Timestamp:

07/06/2011 07:35:51 PM (13 years ago)

Author:

boonebgorges

Message:

Adds WP Admin Bar notification support for Activity component. References #3294

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-activity/bp-activity-loader.php (modified) (1 diff)
• bp-members/bp-members-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -113 +113 @@
  *
  * @package BuddyPress Activity
- * @param $action The type of activity item. Just 'new_at_mention' for now
- * @param $item_id The activity id
- * @param $secondary_item_id In the case of at-mentions, this is the mentioner's id
- * @param $total_items The total number of notifications to format
- */
-function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
+ * @param str $action The type of activity item. Just 'new_at_mention' for now
+ * @param int $item_id The activity id
+ * @param int $secondary_item_id In the case of at-mentions, this is the mentioner's id
+ * @param int $total_items The total number of notifications to format
+ * @param str $format 'string' to get a BuddyBar-compatible notification, 'array' otherwise 
+ */
+function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
     global $bp;
 
@@ -129 +130 @@
 
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_activity_multiple_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( 'You have %1$d new activity mentions', 'buddypress' ), (int)$total_items ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
+                $text = sprintf( __( 'You have %1$d new activity mentions', 'buddypress' ), (int)$total_items );
+                $filter = 'bp_activity_multiple_at_mentions_notification';
             } else {
                 $user_fullname = bp_core_get_user_displayname( $poster_user_id );
-
-                return apply_filters( 'bp_activity_single_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( '%1$s mentioned you in an activity update', 'buddypress' ), $user_fullname ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
+                $text =  sprintf( __( '%1$s mentioned you in an activity update', 'buddypress' ), $user_fullname );
+                $filter = 'bp_activity_single_at_mentions_notification';
             }
         break;
     }
+                
+    if ( 'string' == $format ) {
+        $return = apply_filters( $filter, '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . $text . '</a>', $at_mention_link, (int)$total_items, $activity_id, $poster_user_id );
+    } else {
+        $return = apply_filters( $filter, array(
+            'text' => $text,
+            'link' => $at_mention_link
+        ), $at_mention_link, (int)$total_items, $activity_id, $poster_user_id );
+    }
 
     do_action( 'activity_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
 
-    return false;
+    return $return;
 }
 

trunk/bp-activity/bp-activity-loader.php

@@ -76 +76 @@
             'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
             'search_string'         => __( 'Search Activity...', 'buddypress' ),
-            'global_tables'         => $global_tables
+            'global_tables'         => $global_tables,
+            'notification_callback' => 'bp_activity_format_notifications',
         );
 

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

@@ -57 +57 @@
     if ( empty( $grouped_notifications ) )
         return false;
-
-    // Calculated a renderable outcome for each notification type
+        
+    // Calculate a renderable output for each notification type
     foreach ( (array)$grouped_notifications as $component_name => $action_arrays ) {
         if ( !$action_arrays )