Changeset 7422

Timestamp:

10/13/2013 02:36:04 AM (13 years ago)

Author:

r-a-y

Message:

Delete activity comment meta when deleting parent activity items.

Previously, when deleting parent activity items, BP would delete the
related activity comments, but not the activity comment metadata.

To solve this, activity comments are now queried and removed in the
main BP_Activity_Activity::delete() method and the activity comment
IDs are now properly passed to the delete_activity_meta_entries()
method.

Commit also includes a unit test for this issue.

Hat-tip boonebgorges for feedback.

Fixes #5097.

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (4 diffs)
• tests/testcases/activity/functions.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -551 +551 @@
          * Otherwise use the filters.
          *
+         * @since BuddyPress (1.2)
+         *
          * @param array $args {
          *     @int $id Optional. The ID of a specific item to delete.
@@ -628 +630 @@
                 $activity_ids = $wpdb->get_col( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
 
-                if ( !$wpdb->query( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) )
+                if ( ! $wpdb->query( "DELETE FROM {$bp->activity->table_name} {$where_sql}" ) ) {
                         return false;
-
+                }
+
+                // Handle accompanying activity comments and meta deletion
                 if ( $activity_ids ) {
-                        BP_Activity_Activity::delete_activity_item_comments( $activity_ids );
+                        $activity_ids_comma          = implode( ',', wp_parse_id_list( $activity_ids ) );
+                        $activity_comments_where_sql = "WHERE type = 'activity_comment' AND item_id IN ({$activity_ids_comma})";
+
+                        // Fetch the activity comment IDs for our deleted activity items
+                        $activity_comment_ids = $wpdb->get_col( "SELECT id FROM {$bp->activity->table_name} {$activity_comments_where_sql}" );
+
+                        // We have activity comments!
+                        if ( ! empty( $activity_comment_ids ) ) {
+                                // Delete activity comments
+                                $wpdb->query( "DELETE FROM {$bp->activity->table_name} {$activity_comments_where_sql}" );
+
+                                // Merge activity IDs with activity comment IDs
+                                $activity_ids = array_merge( $activity_ids, $activity_comment_ids );
+                        }
+
+                        // Delete all activity meta entries for activity items and activity comments
                         BP_Activity_Activity::delete_activity_meta_entries( $activity_ids );
-
-                        return $activity_ids;
                 }
 
@@ -644 +661 @@
          * Delete the comments associated with a set of activity items.
          *
+         * @since BuddyPress (1.2)
+         *
+         * @todo Mark as deprecated?  Method is no longer used internally.
+         *
          * @param array $activity_ids Activity IDs whose comments should be deleted.
+         * @param bool $delete_meta Should we delete the activity meta items for these comments?
          * @return bool True on success.
          */
-        public static function delete_activity_item_comments( $activity_ids = array() ) {
+        public static function delete_activity_item_comments( $activity_ids = array(), $delete_meta = true ) {
                 global $bp, $wpdb;
 
+                $delete_meta = (bool) $delete_meta;
+
                 $activity_ids = implode( ',', wp_parse_id_list( $activity_ids ) );
 
+                if ( $delete_meta ) {
+                        // Fetch the activity comment IDs for our deleted activity items
+                        $activity_comment_ids = $wpdb->get_col( "SELECT id FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" );
+
+                        if ( ! empty( $activity_comment_ids ) ) {
+                                self::delete_activity_meta_entries( $activity_comment_ids );
+                        }
+                }
+
                 return $wpdb->query( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" );
         }
@@ -657 +690 @@
         /**
          * Delete the meta entries associated with a set of activity items.
+         *
+         * @since BuddyPress (1.2)
          *
          * @param array $activity_ids Activity IDs whose meta should be deleted.

trunk/tests/testcases/activity/functions.php

@@ -35 +35 @@
         }
 
+        /**
+         * @group delete
+         */
+        public function test_delete_activity_and_meta() {
+                // create an activity update
+                $parent_activity = $this->factory->activity->create( array(
+                        'type' => 'activity_update',
+                ) );
+
+                // create some activity comments
+                $comment_one = $this->factory->activity->create( array(
+                        'type'              => 'activity_comment',
+                        'item_id'           => $parent_activity,
+                        'secondary_item_id' => $parent_activity,
+                ) );
+
+                $comment_two = $this->factory->activity->create( array(
+                        'type'              => 'activity_comment',
+                        'item_id'           => $parent_activity,
+                        'secondary_item_id' => $parent_activity,
+                ) );
+
+                // add some meta to the activity items
+                bp_activity_update_meta( $parent_activity, 'foo', 'bar' );
+                bp_activity_update_meta( $comment_one,     'foo', 'bar' );
+                bp_activity_update_meta( $comment_two,     'foo', 'bar' );
+
+                // now delete the parent activity item
+                // this should hopefully delete the associated comments and meta entries
+                bp_activity_delete( array(
+                        'id' => $parent_activity
+                ) );
+
+                // now fetch the deleted activity entries
+                $get = bp_activity_get( array(
+                        'in'               => array( $parent_activity, $comment_one, $comment_two ),
+                        'display_comments' => 'stream'
+                ) );
+
+                // activities should equal zero
+                $this->assertEquals( 0, $get['total'] );
+
+                // now fetch activity meta for the deleted activity entries
+                $m1 = bp_activity_get_meta( $parent_activity );
+                $m2 = bp_activity_get_meta( $comment_one );
+                $m3 = bp_activity_get_meta( $comment_two );
+
+                // test if activity meta entries still exist
+                $this->assertEquals( false, $m1 );
+                $this->assertEquals( false, $m2 );
+                $this->assertEquals( false, $m3 );
+        }
 }