Ticket #5880: 5880.patch

src/bp-groups/bp-groups-activity.php

@@ -43 +43 @@
                 array( 'activity', 'group', 'member', 'member_groups' )
         );
 
+        bp_activity_set_action(
+                $bp->groups->id,
+                'group_details_updated',
+                __( 'Group details edited', 'buddypress' ),
+                'bp_groups_format_activity_action_group_details_updated',
+                __( 'Group Updates', 'buddypress' ),
+                array( 'activity', 'group', 'member', 'member_groups' )
+        );
+
         // These actions are for the legacy forums
         // Since the bbPress plugin also shares the same 'forums' identifier, we also
         // check for the legacy forums loader class to be extra cautious
@@ -128 +137 @@
 }
 
 /**
+ * Format 'group_details_updated' activity actions.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param string $action Static activity action.
+ * @param object $activity Activity data object.
+ * @return string
+ */
+function bp_groups_format_activity_action_group_details_updated( $action, $activity ) {
+        $user_link = bp_core_get_userlink( $activity->user_id );
+
+        $group = groups_get_group( array(
+                'group_id'        => $activity->item_id,
+                'populate_extras' => false,
+        ) );
+        $group_link = '<a href="' . esc_url( bp_get_group_permalink( $group ) ) . '">' . esc_html( $group->name ) . '</a>';
+
+        // Changed group details are stored in groupmeta, keyed by the activity
+        // timestamp. See {@link bp_groups_group_details_updated_add_activity()}.
+        $changed = groups_get_groupmeta( $activity->item_id, 'updated_details_' . $activity->date_recorded );
+
+        // No changed details were found, so use a generic message
+        if ( empty( $changed ) ) {
+                $action = sprintf( __( '%1$s updated details for the group %2$s', 'buddypress' ), $user_link, $group_link );
+
+        // Name and description changed - to keep things short, don't describe
+        // changes in detail
+        } else if ( isset( $changed['name'] ) && isset( $changed['description'] ) ) {
+                $action = sprintf( __( '%1$s changed the name and description of the group %2$s', 'buddypress' ), $user_link, $group_link );
+
+        // Name only
+        } else if ( ! empty( $changed['name']['old'] ) && ! empty( $changed['name']['new'] ) ) {
+                $action = sprintf( __( '%1$s changed the name of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, $changed['name']['old'], $changed['name']['new'] );
+
+        // Description only
+        } else if ( ! empty( $changed['description']['old'] ) && ! empty( $changed['description']['new'] ) ) {
+                $action = sprintf( __( '%1$s changed the description of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, $changed['description']['old'], $changed['description']['new'] );
+
+        }
+
+        return apply_filters( 'bp_groups_format_activity_action_joined_group', $action, $activity );
+}
+
+/**
  * Fetch data related to groups at the beginning of an activity loop.
  *
  * This reduces database overhead during the activity loop.
@@ -290 +343 @@
 add_action( 'groups_membership_accepted', 'bp_groups_membership_accepted_add_activity', 10, 2 );
 
 /**
+ * Add an activity item when a group's details are updated.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param int $group_id ID of the group.
+ * @param BP_Groups_Group Group object before the details had been changed.
+ * @param bool $notify_members True if the admin has opted to notify group
+ *        members, otherwise false.
+ * @return int|bool The ID of the activity on success. False on error.
+ */
+function bp_groups_group_details_updated_add_activity( $group_id, $old_group, $notify_members ) {
+
+        // Bail if Activity is not active
+        if ( ! bp_is_active( 'activity' ) ) {
+                return false;
+        }
+
+        if ( ! isset( $old_group->name ) || ! isset( $old_group->description ) ) {
+                return false;
+        }
+
+        // If the admin has opted not to notify members, don't post an activity
+        // item either
+        if ( empty( $notify_members ) ) {
+                return;
+        }
+
+        $group = groups_get_group( array(
+                'group_id' => $group_id,
+        ) );
+
+        // Store the changed data, which will be used to generate the activity
+        // action. Since we haven't yet created the activity item, we store the
+        // old group data in groupmeta, keyed by the timestamp that we'll put
+        // on the activity item.
+        $changed = array();
+
+        if ( $group->name !== $old_group->name ) {
+                $changed['name'] = array(
+                        'old' => $old_group->name,
+                        'new' => $group->name,
+                );
+        }
+
+        if ( $group->description !== $old_group->description ) {
+                $changed['description'] = array(
+                        'old' => $old_group->description,
+                        'new' => $group->description,
+                );
+        }
+
+        // If there are no changes, don't post an activity item
+        if ( empty( $changed ) ) {
+                return;
+        }
+
+        $time = bp_core_current_time();
+        groups_update_groupmeta( $group_id, 'updated_details_' . $time, $changed );
+
+        // Record in activity streams
+        return groups_record_activity( array(
+                'type'          => 'group_details_updated',
+                'item_id'       => $group_id,
+                'user_id'       => bp_loggedin_user_id(),
+                'recorded_time' => $time,
+
+        ) );
+
+}
+add_action( 'groups_details_updated', 'bp_groups_group_details_updated_add_activity', 10, 3 );
+
+/**
  * Delete all activity items related to a specific group.
  *
  * @since BuddyPress (1.9.0)

src/bp-groups/bp-groups-functions.php

@@ -186 +186 @@
         if ( empty( $group_name ) || empty( $group_desc ) )
                 return false;
 
-        $group              = groups_get_group( array( 'group_id' => $group_id ) );
+        $group     = groups_get_group( array( 'group_id' => $group_id ) );
+        $old_group = clone $group;
+
         $group->name        = $group_name;
         $group->description = $group_desc;
 
@@ -197 +199 @@
                 groups_notification_group_updated( $group->id );
         }
 
-        do_action( 'groups_details_updated', $group->id );
+        do_action( 'groups_details_updated', $group->id, $old_group, $notify_members );
 
         return true;
 }