Changeset 6479

Timestamp:

10/31/2012 10:41:57 AM (13 years ago)

Author:

djpaul

Message:

Add new function to get details of all registered activity types

• This was taken from part of the list table code for the Activity admin screens
• Activity admin list table has been updated to use this function
• It will be re-used in template functions to be added in future commits

Location:

trunk/bp-activity

Files:

• bp-activity-admin.php (modified) (1 diff)
• bp-activity-functions.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -1173 +1173 @@
      * Markup for the "filter" part of the form (i.e. which activity type to display)
      *
-     * @global object $bp BuddyPress global settings
      * @param string $which 'top' or 'bottom'
      * @since BuddyPress (1.6)
      */
     function extra_tablenav( $which ) {
-        global $bp;
-
         if ( 'bottom' == $which )
             return;
 
-        $actions  = array();
         $selected = !empty( $_REQUEST['activity_type'] ) ? $_REQUEST['activity_type'] : '';
 
-        // Walk through the registered actions, and build an array of actions/values.
-        foreach ( $bp->activity->actions as $action ) {
-            $action = array_values( (array) $action );
-
-            for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
-                $actions[ $action[$i]['key'] ] = $action[$i]['value'];
-        }
-
-        // This was a mis-named activity type from before BP 1.6
-        unset( $actions['friends_register_activity_action'] );
-
-        // This type has not been used since BP 1.0.3. It will be re-instated in a future version.
-        unset( $actions['updated_profile'] );
-
-        // Sort array by the human-readable value
+        // Get all types of activities, and sort alphabetically.
+        $actions  = bp_activity_get_types();
         natsort( $actions );
     ?>

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

@@ -235 +235 @@
 
     return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key );
+}
+
+/**
+ * Fetch details of all registered activity types
+ *
+ * @return array array( type => description ), ...
+ * @since BuddyPress (1.7)
+ */
+function bp_activity_get_types() {
+    $actions  = array();
+
+    // Walk through the registered actions, and build an array of actions/values.
+    foreach ( buddypress()->activity->actions as $action ) {
+        $action = array_values( (array) $action );
+
+        for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
+            $actions[ $action[$i]['key'] ] = $action[$i]['value'];
+    }
+
+    // This was a mis-named activity type from before BP 1.6
+    unset( $actions['friends_register_activity_action'] );
+
+    // This type has not been used since BP 1.0.3. It will be re-instated in a future version.
+    unset( $actions['updated_profile'] );
+
+    return apply_filters( 'bp_activity_get_types', $actions );
 }