Changeset 7187 for trunk/src/includes/extend/buddypress/activity.php

Timestamp:

01/04/2021 04:43:19 AM (5 years ago)

Author:

johnjamesjacoby

Message:

BuddyPress: prevent possible duplicate "Topics" & "Replies" activity filters.

This commit removes legacy shims (for filters like bp_activity_filter_options) and instead trusts that bp_activity_set_action() will be obeyed when outputting filter select HTML elements. These shims were necessary in older versions of BuddyPress and no longer are.

In trunk for 2.7.0. See #3367.

File:

• trunk/src/includes/extend/buddypress/activity.php (modified) (3 diffs)

trunk/src/includes/extend/buddypress/activity.php

@@ -143 +143 @@
         add_action( 'bbp_delete_topic',                  array( $this, 'topic_delete'              ), 10, 1 );
         add_action( 'bbp_delete_reply',                  array( $this, 'reply_delete'              ), 10, 1 );
-
-        // Append forum filters in site wide activity streams
-        add_action( 'bp_activity_filter_options',        array( $this, 'activity_filter_options'   ), 10    );
-
-        // Append forum filters in single member activity streams
-        add_action( 'bp_member_activity_filter_options', array( $this, 'activity_filter_options'   ), 10    );
-
-        // Append forum filters in single group activity streams
-        add_action( 'bp_group_activity_filter_options',  array( $this, 'activity_filter_options'   ), 10    );
     }
 
@@ -208 +199 @@
             array( 'activity', 'member', 'member_groups', 'group' )
         );
-
-        // Group forums
-        /**
-         * An upstream improvement to BuddyPress is required to make these work,
-         * but they are included here to make our lives easier later.
-        if ( bp_is_active( 'groups' ) ) {
-
-            // Topic
-            bp_activity_set_action(
-                buddypress()->groups->id,
-                $this->topic_create,
-                esc_html__( 'New forum topic', 'bbpress' ),
-                'bbp_format_activity_action_new_topic',
-                esc_html__( 'Topics', 'bbpress' ),
-                array( 'activity', 'member', 'member_groups', 'group' )
-            );
-
-            // Reply
-            bp_activity_set_action(
-                buddypress()->groups->id,
-                $this->reply_create,
-                esc_html__( 'New forum reply', 'bbpress' ),
-                'bbp_format_activity_action_new_reply',
-                esc_html__( 'Replies', 'bbpress' ),
-                array( 'activity', 'member', 'member_groups', 'group' )
-            );
-        }
-        */
     }
 
@@ -381 +344 @@
     }
 
-    /**
-     * Append forum options to activity filter select box
-     *
-     * @since 2.1.0 bbPress (r3653)
-     */
-    function activity_filter_options() {
-    ?>
-
-        <option value="<?php echo $this->topic_create; ?>"><?php esc_html_e( 'Topics',  'bbpress' ); ?></option>
-        <option value="<?php echo $this->reply_create; ?>"><?php esc_html_e( 'Replies', 'bbpress' ); ?></option>
-
-    <?php
-    }
-
     /** Topics ****************************************************************/