Ticket #3051: 3051.patch

src/includes/topics/functions.php

@@ -2329 +2329 @@
                                 case 'trash':
                                         check_ajax_referer( "trash-{$nonce_suffix}" );
 
-                                        $retval['view_all'] = true;
-                                        $retval['status']   = wp_trash_post( $r['id'] );
-                                        $retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
+                                        $retval['view_all']    = true;
+                                        $retval['status']      = wp_trash_post( $r['id'] );
+                                        $retval['message']     = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
+                                        $retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] );
 
                                         break;
 
@@ -2338 +2339 @@
                                 case 'untrash':
                                         check_ajax_referer( "untrash-{$nonce_suffix}" );
 
-                                        $retval['status']  = wp_untrash_post( $r['id'] );
-                                        $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the topic.', 'bbpress' );
+                                        $retval['status']      = wp_untrash_post( $r['id'] );
+                                        $retval['message']     = __( '<strong>ERROR</strong>: There was a problem untrashing the topic.', 'bbpress' );
+                                        $retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] );
 
                                         break;
 
@@ -2346 +2348 @@
                                 case 'delete':
                                         check_ajax_referer( "delete-{$nonce_suffix}" );
 
-                                        $retval['status']  = wp_delete_post( $r['id'] );
-                                        $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the topic.', 'bbpress' );
+                                        $retval['status']      = wp_delete_post( $r['id'] );
+                                        $retval['message']     = __( '<strong>ERROR</strong>: There was a problem deleting the topic.', 'bbpress' );
+                                        $retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent );
 
                                         break;
                         }
@@ -2355 +2358 @@
                         break;
         }
 
-        // Maybe redirect back to the topic's forum
-        if ( isset( $r['sub_action'] ) && ( 'delete' === $r['sub_action'] ) ) {
-                $retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent );
-        }
-
         // Add view all if needed
         if ( ! empty( $retval['view_all'] ) ) {
                 $retval['redirect_to'] = bbp_add_view_all( $retval['redirect_to'], true );