Changeset 7711

Timestamp:

12/23/2013 05:45:16 PM (11 years ago)

Author:

johnjamesjacoby

Message:

First pass at extracting registered Notifications callbacks into a helper function. More to do here. See #5300.

Location:

trunk/bp-notifications

Files:

• bp-notifications-classes.php (modified) (3 diffs)
• bp-notifications-functions.php (modified) (1 diff)

trunk/bp-notifications/bp-notifications-classes.php

@@ -554 +554 @@
             'item_id'           => false,
             'secondary_item_id' => false,
-            'component_name'    => array_keys( buddypress()->active_components ),
+            'component_name'    => bp_notifications_get_registered_components(),
             'component_action'  => false,
             'is_new'            => true,
@@ -613 +613 @@
         global $wpdb;
 
-        // Load BuddyPress
-        $bp = buddypress();
-
         /**
          * Default component_name to active_components
@@ -621 +618 @@
          * @see http://buddypress.trac.wordpress.org/ticket/5300
          */
-        $args = wp_parse_args( $args, array( 'component_name' => array_keys( $bp->active_components ) ) );
+        $args = wp_parse_args( $args, array(
+            'component_name' => bp_notifications_get_registered_components()
+        ) );
+
+        // Load BuddyPress
+        $bp = buddypress();
 
         // Build the query

trunk/bp-notifications/bp-notifications-functions.php

@@ -508 +508 @@
     return apply_filters( 'bp_notifications_get_total_notification_count', $count );
 }
+
+/**
+ * Return an array of component names that are currently active and have
+ * registered Notifications callbacks.
+ *
+ * @since BuddyPress (1.9.1)
+ *
+ * @see http://buddypress.trac.wordpress.org/ticket/5300
+ */
+function bp_notifications_get_registered_components() {
+
+    // Get the active components
+    $active_components = buddypress()->active_components;
+
+    // Get the component ID's from the active_components array
+    $component_names   = array_keys( $active_components );
+
+    // Return active components with registered notifications callbacks
+    return apply_filters( 'bp_notifications_get_component_names', $component_names );
+}