Ticket #4429: 4229.01.patch

bp-activity/bp-activity-template.php

@@ -868 +868 @@
         function bp_get_activity_action_name() { return bp_get_activity_type(); }
 
 /**
+ * Outputs the activity component
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @uses bp_get_activity_component()
+ */
+function bp_activity_component() {
+        echo bp_get_activity_component();
+}
+        /**
+         * Returns the component of the current activity item
+         *
+         * @since BuddyPress (1.7)
+         *
+         * @global object $activities_template {@link BP_Activity_Template}
+         * @uses apply_filters() Filter 'bp_get_activity_component' to modify
+         *
+         * @return string The component of the current activity
+         */
+        function bp_get_activity_component() {
+                global $activities_template;
+
+                $component = false;
+
+                if ( isset( $activities_template->activity->component ) ) {
+                        $component = $activities_template->activity->component;
+                }
+
+                return apply_filters( 'bp_get_activity_component', $component );
+        }
+
+/**
  * Outputs the activity user id
  *
  * @since BuddyPress (1.1)

bp-groups/bp-groups-filters.php

@@ -169 +169 @@
         return apply_filters( 'groups_filter_bbpress_root_page_sql', 't.topic_id' );
 }
 add_filter( 'get_latest_topics_fields', 'groups_filter_forums_root_page_sql' );
+
+/**
+ * Keep blocked group members from replying to activity items in that group
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param bool $can_comment
+ * @return bool
+ */
+function bp_groups_activity_can_comment( $can_comment ) {
+        if ( buddypress()->groups->id == bp_get_activity_component() &&
+             is_user_logged_in() &&
+             ! current_user_can( 'bp_moderate' ) &&
+             groups_is_user_banned( bp_loggedin_user_id(), bp_get_activity_item_id() )
+           ) {
+                $can_comment = false;
+        }
+
+        return $can_comment;
+}
+add_filter( 'bp_activity_can_comment', 'bp_groups_activity_can_comment' );