Changeset 7864

Timestamp:

10/08/2026 04:22:00 PM (2 weeks ago)

Author:

johnjamesjacoby

Message:

Moderation: Avoid returning after pending notices.

Keep pending submissions in the current request without using the error queue as a control-flow boundary. Only enter redirect handling for submissions that are not pending moderation.

In trunk, for 2.7.

See #3353.

Location:

trunk/src/includes

Files:

• replies/functions.php (modified) (1 diff)
• topics/functions.php (modified) (1 diff)

trunk/src/includes/replies/functions.php

@@ -512 +512 @@
                         bbp_add_error( 'bbp_reply_moderated', esc_html__( 'Your reply is pending moderation.', 'bbpress' ) );
                         unset( $_POST['bbp_reply_title'], $_POST['bbp_reply_content'], $_POST['bbp_topic_tags'] );
-                        return;
+
+                } else {
+                        /** Redirect ******************************************************/
+
+                        // Redirect to
+                        $redirect_to = bbp_get_redirect_to();
+
+                        // Get the reply URL
+                        $reply_url = bbp_get_reply_url( $reply_id, $redirect_to );
+
+                        // Allow to be filtered
+                        $reply_url = apply_filters( 'bbp_new_reply_redirect_to', $reply_url, $redirect_to, $reply_id );
+
+                        /** Successful Save ***************************************************/
+
+                        // Redirect back to new reply
+                        bbp_redirect( $reply_url );
                 }
-
-                /** Redirect **********************************************************/
-
-                // Redirect to
-                $redirect_to = bbp_get_redirect_to();
-
-                // Get the reply URL
-                $reply_url = bbp_get_reply_url( $reply_id, $redirect_to );
-
-                // Allow to be filtered
-                $reply_url = apply_filters( 'bbp_new_reply_redirect_to', $reply_url, $redirect_to, $reply_id );
-
-                /** Successful Save ***************************************************/
-
-                // Redirect back to new reply
-                bbp_redirect( $reply_url );
 
         /** Errors ****************************************************************/

trunk/src/includes/topics/functions.php

@@ -407 +407 @@
                         bbp_add_error( 'bbp_topic_moderated', esc_html__( 'Your topic is pending moderation.', 'bbpress' ) );
                         unset( $_POST['bbp_topic_title'], $_POST['bbp_topic_content'], $_POST['bbp_topic_tags'] );
-                        return;
-                }
-
-                /** Redirect **********************************************************/
-
-                // Redirect to
-                $redirect_to = bbp_get_redirect_to();
-
-                // Get the topic URL
-                $redirect_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
-
-                // Add view all?
-                if ( bbp_get_view_all() || ! empty( $view_all ) ) {
-
-                        // User can moderate, so redirect to topic with view all set
-                        if ( current_user_can( 'moderate', $topic_id ) ) {
-                                $redirect_url = bbp_add_view_all( $redirect_url );
-
-                        // User cannot moderate, so redirect to forum
-                        } else {
-                                $redirect_url = bbp_get_forum_permalink( $forum_id );
+
+                } else {
+                        /** Redirect ******************************************************/
+
+                        // Redirect to
+                        $redirect_to = bbp_get_redirect_to();
+
+                        // Get the topic URL
+                        $redirect_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
+
+                        // Add view all?
+                        if ( bbp_get_view_all() || ! empty( $view_all ) ) {
+
+                                // User can moderate, so redirect to topic with view all set
+                                if ( current_user_can( 'moderate', $topic_id ) ) {
+                                        $redirect_url = bbp_add_view_all( $redirect_url );
+
+                                // User cannot moderate, so redirect to forum
+                                } else {
+                                        $redirect_url = bbp_get_forum_permalink( $forum_id );
+                                }
                         }
-                }
-
-                // Allow to be filtered
-                $redirect_url = apply_filters( 'bbp_new_topic_redirect_to', $redirect_url, $redirect_to, $topic_id );
-
-                /** Successful Save ***************************************************/
-
-                // Redirect back to new topic
-                bbp_redirect( $redirect_url );
+
+                        // Allow to be filtered
+                        $redirect_url = apply_filters( 'bbp_new_topic_redirect_to', $redirect_url, $redirect_to, $topic_id );
+
+                        /** Successful Save ***************************************************/
+
+                        // Redirect back to new topic
+                        bbp_redirect( $redirect_url );
+                }
 
         /** Errors ****************************************************************/