diff --git src/bp-activity/bp-activity-admin.php src/bp-activity/bp-activity-admin.php
index ab68de61b..0eb1e610a 100644
--- src/bp-activity/bp-activity-admin.php
+++ src/bp-activity/bp-activity-admin.php
@@ -840,13 +840,19 @@ function bp_activity_admin_get_activity_actions() {
$action = array_values( (array) $action );
for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ ) {
+ /**
+ * Don't take in account:
+ * - a mis-named Friends activity type from before BP 1.6,
+ * - The Group's component 'activity_update' one as the Activity component is using it.
+ */
+ if ( 'friends_register_activity_action' === $action[$i]['key'] || 'bp_groups_format_activity_action_group_activity_update' === $action[$i]['format_callback'] ) {
+ continue;
+ }
+
$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'] );
-
// Sort array by the human-readable value.
natsort( $actions );
@@ -870,13 +876,20 @@ function bp_activity_admin_edit_metabox_type( $item ) {
foreach ( bp_activity_get_actions() as $action ) {
$action = array_values( (array) $action );
- for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
+ for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ ) {
+ /**
+ * Don't take in account:
+ * - a mis-named Friends activity type from before BP 1.6,
+ * - The Group's component 'activity_update' one as the Activity component is using it.
+ */
+ if ( 'friends_register_activity_action' === $action[$i]['key'] || 'bp_groups_format_activity_action_group_activity_update' === $action[$i]['format_callback'] ) {
+ continue;
+ }
+
$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'] );
-
// Sort array by the human-readable value.
natsort( $actions );
diff --git src/bp-activity/bp-activity-template.php src/bp-activity/bp-activity-template.php
index be1e48b40..fc0e82a76 100644
--- src/bp-activity/bp-activity-template.php
+++ src/bp-activity/bp-activity-template.php
@@ -3848,6 +3848,11 @@ function bp_activity_show_filters( $context = '' ) {
$action['key'] = 'friendship_accepted,friendship_created';
}
+ // The 'activity_update' filter is already used by the Activity component.
+ if ( 'bp_groups_format_activity_action_group_activity_update' === $action['format_callback'] ) {
+ continue;
+ }
+
$filters[ $action['key'] ] = $action['label'];
}
diff --git src/bp-activity/classes/class-bp-activity-list-table.php src/bp-activity/classes/class-bp-activity-list-table.php
index e7d023969..1538d2140 100644
--- src/bp-activity/classes/class-bp-activity-list-table.php
+++ src/bp-activity/classes/class-bp-activity-list-table.php
@@ -435,6 +435,11 @@ class BP_Activity_List_Table extends WP_List_Table {
$component = 'xprofile';
}
+ // The 'activity_update' filter is already used by the Activity component.
+ if ( isset( $actions->activity_update ) && 'bp_groups_format_activity_action_group_activity_update' === $actions->activity_update['format_callback'] ) {
+ unset( $actions->activity_update );
+ }
+
if ( bp_is_active( $component ) ) {
if ( $component === 'xprofile' ) {
$component_name = buddypress()->profile->name;
@@ -455,7 +460,7 @@ class BP_Activity_List_Table extends WP_List_Table {
+ if ( 'friends_register_activity_action' !== $action_key ) : ?>
diff --git src/bp-groups/bp-groups-activity.php src/bp-groups/bp-groups-activity.php
index 85d2a8fc8..a2403257d 100644
--- src/bp-groups/bp-groups-activity.php
+++ src/bp-groups/bp-groups-activity.php
@@ -54,6 +54,15 @@ function groups_register_activity_actions() {
array( 'activity', 'group', 'member', 'member_groups' )
);
+ bp_activity_set_action(
+ $bp->groups->id,
+ 'activity_update',
+ __( 'Posted a status update in a Group', 'buddypress' ),
+ 'bp_groups_format_activity_action_group_activity_update',
+ __( 'Group Activity Updates', 'buddypress' ),
+ array( 'activity', 'group', 'member', 'member_groups' )
+ );
+
/**
* Fires at end of registration of the default activity actions for the Groups component.
*
@@ -63,6 +72,27 @@ function groups_register_activity_actions() {
}
add_action( 'bp_register_activity_actions', 'groups_register_activity_actions' );
+/**
+ * Get the group object the activity belongs to.
+ *
+ * @since 5.0.0
+ *
+ * @param integer $group_id The group ID the activity is linked to.
+ * @return BP_Groups_Group The group object the activity belongs to.
+ */
+function bp_groups_get_activity_group( $group_id = 0 ) {
+ // If displaying a specific group, check the activity belongs to it.
+ if ( bp_is_group() && bp_get_current_group_id() === (int) $group_id ) {
+ $group = groups_get_current_group();
+
+ // Otherwise get the group the activity belongs to.
+ } else {
+ $group = groups_get_group( $group_id );
+ }
+
+ return $group;
+}
+
/**
* Format 'created_group' activity actions.
*
@@ -75,7 +105,7 @@ add_action( 'bp_register_activity_actions', 'groups_register_activity_actions' )
function bp_groups_format_activity_action_created_group( $action, $activity ) {
$user_link = bp_core_get_userlink( $activity->user_id );
- $group = groups_get_group( $activity->item_id );
+ $group = bp_groups_get_activity_group( $activity->item_id );
$group_link = '' . esc_html( $group->name ) . '';
$action = sprintf( __( '%1$s created the group %2$s', 'buddypress'), $user_link, $group_link );
@@ -103,7 +133,7 @@ function bp_groups_format_activity_action_created_group( $action, $activity ) {
function bp_groups_format_activity_action_joined_group( $action, $activity ) {
$user_link = bp_core_get_userlink( $activity->user_id );
- $group = groups_get_group( $activity->item_id );
+ $group = bp_groups_get_activity_group( $activity->item_id );
$group_link = '' . esc_html( $group->name ) . '';
$action = sprintf( __( '%1$s joined the group %2$s', 'buddypress' ), $user_link, $group_link );
@@ -142,7 +172,7 @@ function bp_groups_format_activity_action_joined_group( $action, $activity ) {
function bp_groups_format_activity_action_group_details_updated( $action, $activity ) {
$user_link = bp_core_get_userlink( $activity->user_id );
- $group = groups_get_group( $activity->item_id );
+ $group = bp_groups_get_activity_group( $activity->item_id );
$group_link = '' . esc_html( $group->name ) . '';
/*
@@ -183,6 +213,38 @@ function bp_groups_format_activity_action_group_details_updated( $action, $activ
return apply_filters( 'bp_groups_format_activity_action_joined_group', $action, $activity );
}
+/**
+ * Format the action for activity updates posted in a Group.
+ *
+ * @since 5.0.0
+ *
+ * @param string $action Static activity action.
+ * @param object $activity Activity data object.
+ * @return string The formatted action for activity updates posted in a Group.
+ */
+function bp_groups_format_activity_action_group_activity_update( $action, $activity ) {
+ $user_link = bp_core_get_userlink( $activity->user_id );
+ $group = bp_groups_get_activity_group( $activity->item_id );
+
+ $group_link = '' . esc_html( $group->name ) . '';
+
+ // Set the Activity update posted in a Group action.
+ $action = sprintf( esc_html__( '%1$s posted an update in the group %2$s', 'buddypress' ), $user_link, $group_link );
+
+ /** This filter is documented in wp-includes/deprecated.php */
+ $action = apply_filters_deprecated( 'groups_activity_new_update_action', array( $action ), '5.0.0', 'bp_groups_format_activity_action_group_activity_update' );
+
+ /**
+ * Filters the Group's activity update action.
+ *
+ * @since 5.0.0
+ *
+ * @param string $action The Group's activity update action.
+ * @param object $activity Activity data object.
+ */
+ return apply_filters( 'bp_groups_format_activity_action_group_activity_update', $action, $activity );
+}
+
/**
* Fetch data related to groups at the beginning of an activity loop.
*
@@ -440,12 +502,8 @@ function groups_record_activity( $args = '' ) {
// Set the default for hide_sitewide by checking the status of the group.
$hide_sitewide = false;
- if ( !empty( $args['item_id'] ) ) {
- if ( bp_get_current_group_id() == $args['item_id'] ) {
- $group = groups_get_current_group();
- } else {
- $group = groups_get_group( $args['item_id'] );
- }
+ if ( ! empty( $args['item_id'] ) ) {
+ $group = bp_groups_get_activity_group( $args['item_id'] );
if ( isset( $group->status ) && 'public' != $group->status ) {
$hide_sitewide = true;
@@ -470,6 +528,82 @@ function groups_record_activity( $args = '' ) {
return bp_activity_add( $r );
}
+/**
+ * Post an Activity status update affiliated with a group.
+ *
+ * @since 1.2.0
+ * @since 2.6.0 Added 'error_type' parameter to $args.
+ *
+ * @param array|string $args {
+ * Array of arguments.
+ * @type string $content The content of the update.
+ * @type int $user_id Optional. ID of the user posting the update. Default:
+ * ID of the logged-in user.
+ * @type int $group_id Optional. ID of the group to be affiliated with the
+ * update. Default: ID of the current group.
+ * }
+ * @return WP_Error|bool|int Returns the ID of the new activity item on success, or false on failure.
+ */
+function groups_post_update( $args = '' ) {
+ $bp = buddypress();
+
+ $r = bp_parse_args( $args, array(
+ 'content' => false,
+ 'user_id' => bp_loggedin_user_id(),
+ 'group_id' => 0,
+ 'error_type' => 'bool'
+ ), 'groups_post_update' );
+ extract( $r, EXTR_SKIP );
+
+ if ( empty( $group_id ) && !empty( $bp->groups->current_group->id ) )
+ $group_id = $bp->groups->current_group->id;
+
+ if ( empty( $content ) || !strlen( trim( $content ) ) || empty( $user_id ) || empty( $group_id ) )
+ return false;
+
+ $bp->groups->current_group = groups_get_group( $group_id );
+
+ // Be sure the user is a member of the group before posting.
+ if ( !bp_current_user_can( 'bp_moderate' ) && !groups_is_user_member( $user_id, $group_id ) )
+ return false;
+
+ // Record this in activity streams.
+ $activity_content = $content;
+
+ /**
+ * Filters the content for the new group activity update.
+ *
+ * @since 1.2.0
+ *
+ * @param string $activity_content The content of the update.
+ */
+ $content_filtered = apply_filters( 'groups_activity_new_update_content', $activity_content );
+
+ $activity_id = groups_record_activity( array(
+ 'user_id' => $user_id,
+ 'content' => $content_filtered,
+ 'type' => 'activity_update',
+ 'item_id' => $group_id,
+ 'error_type' => $error_type
+ ) );
+
+ groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
+
+ /**
+ * Fires after posting of an Activity status update affiliated with a group.
+ *
+ * @since 1.2.0
+ *
+ * @param string $content The content of the update.
+ * @param int $user_id ID of the user posting the update.
+ * @param int $group_id ID of the group being posted to.
+ * @param bool $activity_id Whether or not the activity recording succeeded.
+ */
+ do_action( 'bp_groups_posted_update', $content, $user_id, $group_id, $activity_id );
+
+ return $activity_id;
+}
+
/**
* Function used to determine if a user can comment on a group activity item.
*
diff --git src/bp-groups/bp-groups-functions.php src/bp-groups/bp-groups-functions.php
index 43240122a..b391afd76 100644
--- src/bp-groups/bp-groups-functions.php
+++ src/bp-groups/bp-groups-functions.php
@@ -1266,99 +1266,6 @@ function groups_is_user_creator( $user_id, $group_id ) {
return BP_Groups_Member::check_is_creator( $user_id, $group_id );
}
-/** Group Activity Posting ****************************************************/
-
-/**
- * Post an Activity status update affiliated with a group.
- *
- * @since 1.2.0
- * @since 2.6.0 Added 'error_type' parameter to $args.
- *
- * @param array|string $args {
- * Array of arguments.
- * @type string $content The content of the update.
- * @type int $user_id Optional. ID of the user posting the update. Default:
- * ID of the logged-in user.
- * @type int $group_id Optional. ID of the group to be affiliated with the
- * update. Default: ID of the current group.
- * }
- * @return WP_Error|bool|int Returns the ID of the new activity item on success, or false on failure.
- */
-function groups_post_update( $args = '' ) {
- if ( ! bp_is_active( 'activity' ) ) {
- return false;
- }
-
- $bp = buddypress();
-
- $r = bp_parse_args( $args, array(
- 'content' => false,
- 'user_id' => bp_loggedin_user_id(),
- 'group_id' => 0,
- 'error_type' => 'bool'
- ), 'groups_post_update' );
- extract( $r, EXTR_SKIP );
-
- if ( empty( $group_id ) && !empty( $bp->groups->current_group->id ) )
- $group_id = $bp->groups->current_group->id;
-
- if ( empty( $content ) || !strlen( trim( $content ) ) || empty( $user_id ) || empty( $group_id ) )
- return false;
-
- $bp->groups->current_group = groups_get_group( $group_id );
-
- // Be sure the user is a member of the group before posting.
- if ( !bp_current_user_can( 'bp_moderate' ) && !groups_is_user_member( $user_id, $group_id ) )
- return false;
-
- // Record this in activity streams.
- $activity_action = sprintf( __( '%1$s posted an update in the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '' . esc_attr( $bp->groups->current_group->name ) . '' );
- $activity_content = $content;
-
- /**
- * Filters the action for the new group activity update.
- *
- * @since 1.2.0
- *
- * @param string $activity_action The new group activity update.
- */
- $action = apply_filters( 'groups_activity_new_update_action', $activity_action );
-
- /**
- * Filters the content for the new group activity update.
- *
- * @since 1.2.0
- *
- * @param string $activity_content The content of the update.
- */
- $content_filtered = apply_filters( 'groups_activity_new_update_content', $activity_content );
-
- $activity_id = groups_record_activity( array(
- 'user_id' => $user_id,
- 'action' => $action,
- 'content' => $content_filtered,
- 'type' => 'activity_update',
- 'item_id' => $group_id,
- 'error_type' => $error_type
- ) );
-
- groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
-
- /**
- * Fires after posting of an Activity status update affiliated with a group.
- *
- * @since 1.2.0
- *
- * @param string $content The content of the update.
- * @param int $user_id ID of the user posting the update.
- * @param int $group_id ID of the group being posted to.
- * @param bool $activity_id Whether or not the activity recording succeeded.
- */
- do_action( 'bp_groups_posted_update', $content, $user_id, $group_id, $activity_id );
-
- return $activity_id;
-}
-
/** Group Invitations *********************************************************/
/**