Changeset 6269

Timestamp:

01/30/2017 11:02:04 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Topics: get a fresh value for redirect_to when trashing/untrashing/deleting.

Fixes a bug where trashing a topic theme-side would redirect to the prefetched topic URL and 404.

(In the case of trashed topics, since WordPress 4.7, the slug receives a __trashed suffix, changing the topic link.)

Fixes #3051.

File:

• trunk/src/includes/topics/functions.php (modified) (4 diffs)

trunk/src/includes/topics/functions.php

@@ -2330 +2330 @@
                     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;
@@ -2339 +2340 @@
                     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;
@@ -2347 +2349 @@
                     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;
@@ -2354 +2357 @@
 
             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 );
     }