Changeset 2644

Timestamp:

02/10/2010 03:15:48 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1862 - remove all child comments when deleting a comment.

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (3 diffs)

trunk/bp-activity.php

@@ -687 +687 @@
  * The action passes one parameter that is a single activity ID or an
  * array of activity IDs depending on the number deleted.
+ *
+ * If you are deleting an activity comment please use bp_activity_delete_comment();
 */
 
@@ -755 +757 @@
     /* End deprecation */
 
+function bp_activity_delete_comment( $activity_id, $comment_id ) {
+    /* Recursively delete all children of this comment. */
+    if ( $children = BP_Activity_Activity::get_child_comments( $comment_id ) ) {
+        foreach( (array)$children as $child )
+            bp_activity_delete_comment( $activity_id, $child->id );
+    }
+    bp_activity_delete( array( 'secondary_item_id' => $comment_id, 'type' => 'activity_comment', 'item_id' => $activity_id ) );
+
+    /* Delete the actual comment */
+    if ( !bp_activity_delete( array( 'id' => $comment_id, 'type' => 'activity_comment' ) ) )
+        return false;
+
+    /* Recalculate the comment tree */
+    BP_Activity_Activity::rebuild_activity_comment_tree( $activity_id );
+
+    return true;
+}
+
 function bp_activity_get_permalink( $activity_id, $activity_obj = false ) {
     global $bp;

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

@@ -39 +39 @@
             $this->date_recorded = $row->date_recorded;
             $this->hide_sitewide = $row->hide_sitewide;
+            $this->mptt_left = $row->mptt_left;
+            $this->mptt_right = $row->mptt_right;
         }
     }
@@ -374 +376 @@
 
         /* Get all descendants of this node */
-        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
+        $descendants = BP_Activity_Activity::get_child_comments( $parent_id );
 
         /* Loop the descendants and recalculate the left and right values */
@@ -390 +392 @@
     }
 
+    function get_child_comments( $parent_id ) {
+        global $bp, $wpdb;
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
+    }
+
     function get_recorded_components() {
         global $wpdb, $bp;

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -226 +226 @@
     return true;
 }
-add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity' );
 add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
+
+function bp_dtheme_delete_activity_comment() {
+    global $bp;
+
+    /* Check the nonce */
+    check_admin_referer( 'bp_activity_delete_link' );
+
+    if ( !is_user_logged_in() ) {
+        echo '-1';
+        return false;
+    }
+
+    $comment = new BP_Activity_Activity( $_POST['id'] );
+
+    /* Check access */
+    if ( !is_site_admin() && $comment->user_id != $bp->loggedin_user->id )
+        return false;
+
+    if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete_comment( $comment->item_id, $comment->id ) ) {
+        echo '-1<div id="message" class="error"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>';
+        return false;
+    }
+
+    return true;
+}
+add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity_comment' );
 
 function bp_dtheme_mark_activity_favorite() {

trunk/bp-themes/bp-default/_inc/global.js

@@ -373 +373 @@
             var link_href = target.attr('href');
             var comment_li = target.parent().parent();
+            var form = comment_li.parents('div.activity-comments').children('form');
 
             var nonce = link_href.split('_wpnonce=');
@@ -386 +387 @@
             j('div.activity-comments ul div.error').remove();
 
+            /* Reset the form position */
+            comment_li.parents('div.activity-comments').append(form);
+
             j.post( ajaxurl, {
-                action: 'delete_activity',
+                action: 'delete_activity_comment',
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': nonce,
@@ -398 +402 @@
                     comment_li.prepend( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
                 } else {
-                    comment_li.fadeOut( 200, function() {
-                        var children = j( 'li#' + comment_li.attr('id') + ' ul:first' );
-
-                        /* Fade in sub comments if any were found. */
-                        if ( children.length )
-                            comment_li.parent().append( children.html() ).hide().fadeIn( 200 );
-                    });
+                    var children = j( 'li#' + comment_li.attr('id') + ' ul' ).children('li');
+                    comment_li.fadeOut(200);
 
                     /* Decrease the "Reply (X)" button count */
                     var parent_li = comment_li.parents('ul#activity-stream > li');
-                    j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html( j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html() - 1 );
+                    j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html( j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html() - ( 1 + children.length ) );
                 }
             });