Changeset 10546 for trunk/src/bp-activity/classes/class-bp-activity-list-table.php

Timestamp:

02/07/2016 04:59:52 PM (10 years ago)

Author:

imath

Message:

Post Type Activities: make sure it is possible to filter by post type activity comment action within the Activity Administration screen.

Fixes #6482

File:

• trunk/src/bp-activity/classes/class-bp-activity-list-table.php (modified) (6 diffs)

trunk/src/bp-activity/classes/class-bp-activity-list-table.php

@@ -85 +85 @@
                 // Option defaults.
                 $filter           = array();
+                $filter_query     = false;
                 $include_id       = false;
                 $search_terms     = false;
@@ -111 +112 @@
 
                 // Filter.
-                if ( !empty( $_REQUEST['activity_type'] ) )
+                if ( ! empty( $_REQUEST['activity_type'] ) ) {
                         $filter = array( 'action' => $_REQUEST['activity_type'] );
+
+                        /**
+                         * Filter here to override the filter with a filter query
+                         *
+                         * @since  2.5.0
+                         *
+                         * @param array $filter
+                         */
+                        $has_filter_query = apply_filters( 'bp_activity_list_table_filter_activity_type_items', $filter );
+
+                        if ( ! empty( $has_filter_query['filter_query'] ) ) {
+                                // Reset the filter
+                                $filter       = array();
+
+                                // And use the filter query instead
+                                $filter_query = $has_filter_query['filter_query'];
+                        }
+                }
 
                 // Are we doing a search?
@@ -140 +159 @@
                         'per_page'         => $per_page,
                         'search_terms'     => $search_terms,
+                        'filter_query'     => $filter_query,
                         'show_hidden'      => true,
                         // 'sort'             => $sort,
@@ -743 +763 @@
          *
          * @since 2.0.0
+         * @since 2.5.0 Include Post type activities types
          *
          * @param array $item An array version of the BP_Activity_Activity object.
@@ -748 +769 @@
          */
         protected function can_comment( $item  ) {
-                $can_comment = true;
-
-                if ( $this->disable_blogforum_comments ) {
-                        switch ( $item['type'] ) {
-                                case 'new_blog_post' :
-                                case 'new_blog_comment' :
-                                case 'new_forum_topic' :
-                                case 'new_forum_post' :
-                                        $can_comment = false;
-                                        break;
+                $can_comment = bp_activity_type_supports( $item['type'], 'comment-reply' );
+
+                if ( ! $this->disable_blogforum_comments && bp_is_active( 'blogs' ) ) {
+                        $parent_activity = false;
+
+                        if ( bp_activity_type_supports( $item['type'], 'post-type-comment-tracking' ) ) {
+                                $parent_activity = (object) $item;
+                        } elseif ( 'activity_comment' === $item['type'] ) {
+                                $parent_activity = new BP_Activity_Activity( $item['item_id'] );
                         }
 
-                // Activity comments supported.
-                } else {
-                        // Activity comment.
-                        if ( 'activity_comment' == $item['type'] ) {
-                                // Blogs.
-                                if ( bp_is_active( 'blogs' ) ) {
-                                        // Grab the parent activity entry.
-                                        $parent_activity = new BP_Activity_Activity( $item['item_id'] );
-
-                                        // Fetch blog post comment depth and if the blog post's comments are open.
-                                        bp_blogs_setup_activity_loop_globals( $parent_activity );
-
-                                        // Check if the activity item can be replied to.
-                                        if ( false === bp_blogs_can_comment_reply( true, $item ) ) {
-                                                $can_comment = false;
-                                        }
-                                }
-
-                        // Blog post.
-                        } elseif ( 'new_blog_post' == $item['type'] ) {
-                                if ( bp_is_active( 'blogs' ) ) {
-                                        bp_blogs_setup_activity_loop_globals( (object) $item );
-
-                                        if ( empty( buddypress()->blogs->allow_comments[$item['id']] ) ) {
-                                                $can_comment = false;
-                                        }
-                                }
+                        if ( isset( $parent_activity->type ) && bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'post_type' ) ) {
+                                // Fetch blog post comment depth and if the blog post's comments are open.
+                                bp_blogs_setup_activity_loop_globals( $parent_activity );
+
+                                $can_comment = bp_blogs_can_comment_reply( true, $item );
                         }
                 }
@@ -794 +792 @@
                  *
                  * @since 2.0.0
-                 *
-                 * @param bool $can_comment Whether an activity item can be commented on or not.
+                 * @since 2.5.0 Add a second parameter to include the activity item into the filter.
+                 *
+                 * @param bool  $can_comment Whether an activity item can be commented on or not.
+                 * @param array $item        An array version of the BP_Activity_Activity object.
                  */
-                return apply_filters( 'bp_activity_list_table_can_comment', $can_comment );
+                return apply_filters( 'bp_activity_list_table_can_comment', $can_comment, $item );
         }