Ticket #2002: 2002.001.diff

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

@@ -204 +204 @@
                         var nonce = link_href.split('_wpnonce=');
                                 nonce = nonce[1];
 
+                        var redirect_to = link_href.split('bp_redirect_to=');
+                                redirect_to = redirect_to[1].split('&');
+                                redirect_to = decodeURIComponent(redirect_to[0]);
+
                         target.addClass('loading');
 
                         j.post( ajaxurl, {
@@ -220 +224 @@
                                         li.children('div#message').hide().fadeIn(200);
                                 } else {
                                         li.slideUp(200);
+                                        window.location = redirect_to;
                                 }
                         });
 

bp-activity/bp-activity-templatetags.php

@@ -716 +716 @@
         function bp_get_activity_delete_link() {
                 global $activities_template, $bp;
 
-                return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id, 'bp_activity_delete_link' ) . '" class="item-button delete-activity confirm">' . __( 'Delete', 'buddypress' ) . '</a>' );
+                if ( $bp->current_component == $bp->activity->slug && is_numeric( $bp->current_action ) ) {
+                         if ( wp_get_referer() )
+                                $bp_redirect_to = '?bp_redirect_to=' . wp_get_referer();
+                        else
+                                $bp_redirect_to = '?bp_redirect_to=' . $bp->root_domain . '/' . $bp->activity->slug . '/';
+                }
+
+                return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id . $bp_redirect_to, 'bp_activity_delete_link' ) . '" class="item-button delete-activity confirm">' . __( 'Delete', 'buddypress' ) . '</a>' );
         }
 
 function bp_activity_latest_update( $user_id = false ) {