Ticket #6663: 6663.02.patch

src/bp-notifications/bp-notifications-functions.php

@@ -200 +200 @@
         // Calculate a renderable output for each notification type
         foreach ( $grouped_notifications as $component_name => $action_arrays ) {
 
+                // We prefer that extended profile component-related notifications use
+                // the component_name of 'xprofile'. However, the extended profile child
+                // object in the $bp object is keyed as 'profile', which is where we need
+                // to look for the registered notification callback.
+                if ( 'xprofile' == $component_name ) {
+                        $component_name = 'profile';
+                }
+
                 // Skip if group is empty
                 if ( empty( $action_arrays ) ) {
                         continue;
@@ -611 +619 @@
                 if ( !empty( $bp->$component->notification_callback ) ) {
                         $component_names[] = $component;
                 }
+                // The extended profile component is identified in the active_components array as 'xprofile'.
+                // However, the extended profile child object has the key 'profile' in the $bp object.
+                if ( 'xprofile' == $component && ! empty( $bp->profile->notification_callback ) ) {
+                        $component_names[] = $component;
+                }
         }
 
         /**

src/bp-xprofile/bp-xprofile-loader.php

@@ -67 +67 @@
                         'settings',
                         'template',
                         'functions',
+                        'notifications',
                 );
 
                 if ( is_admin() ) {

new file src/bp-xprofile/bp-xprofile-notifications.php

@@ +1 @@
+<?php
+/** Notifications *************************************************************/
+
+/**
+ * Format notifications for the extended profile (Xprofile) component.
+ *
+ * @since 2.4.0
+ *
+ * @param string $action            The kind of notification being rendered.
+ * @param int    $item_id           The primary item ID.
+ * @param int    $secondary_item_id The secondary item ID.
+ * @param int    $total_items       The total number of messaging-related notifications
+ *                                  waiting for the user.
+ * @param string $format            'string' for BuddyBar-compatible notifications; 'array'
+ *                                  for WP Toolbar. Default: 'string'.
+ *
+ * @return string
+ */
+function xprofile_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
+        switch ( $action ) {
+                default:
+
+                        /**
+                         * Allows plugins to filter extended profile-related custom notifications.
+                         * Notifications must have a 'component_name' of 'xprofile' to be routed
+                         * to this function.
+                         *
+                         *
+                         * @since 2.4.0
+                         *
+                         * @param string $notification      Null value.
+                         * @param int    $item_id           The primary item ID.
+                         * @param int    $secondary_item_id The secondary item ID.
+                         * @param int    $total_items       The total number of messaging-related notifications
+                         *                                  waiting for the user.
+                         * @param string $format            'string' for BuddyBar-compatible notifications;
+                         *                                  'array' for WP Toolbar.
+                         */
+                        $custom_action_notification = apply_filters( 'bp_xprofile_' . $action . '_notification', null, $item_id, $secondary_item_id, $total_items, $format );
+
+                        if ( ! is_null( $custom_action_notification ) ) {
+                                return $custom_action_notification;
+                        }
+
+                        break;
+        }
+
+        return false;
+}
+ No newline at end of file