Ticket #3353: 3353.2.patch

src/includes/core/functions.php

@@ -305 +305 @@
         return (bool) apply_filters( 'bbp_has_errors', $has_errors, bbpress()->errors );
 }
 
+/**
+ * Check if a specific error message exists in queue
+ *
+ * @since 2.6.7 bbPress (r3381)
+ *
+ * @param string $code Unique code to check for
+ */
+function bbp_has_error( $code = '' ) {
+
+        // Default return value
+        $retval = false;
+
+        // Has errors
+        if ( bbp_has_errors() ) {
+                $errors = bbpress()->errors->get_error_codes();
+                $retval = in_array( $code, $errors, true );
+        }
+
+        return (bool) apply_filters( 'bbp_has_error', $retval, $code );
+}
+
 /** Mentions ******************************************************************/
 
 /**

src/includes/forums/template.php

@@ -2108 +2108 @@
          */
         function bbp_get_form_forum_content() {
 
+                // Default return value
+                $forum_content = '';
+
                 // Get _POST data
                 if ( bbp_is_forum_form_post_request() && isset( $_POST['bbp_forum_content'] ) ) {
-                        $forum_content = wp_unslash( $_POST['bbp_forum_content'] );
 
+                        // Use if content was not moderated
+                        if ( ! bbp_has_error( 'bbp_forum_moderated' ) ) {
+                                $forum_content = wp_unslash( $_POST['bbp_forum_content'] );
+                        }
+
                 // Get edit data
                 } elseif ( bbp_is_forum_edit() ) {
                         $forum_content = bbp_get_global_post_field( 'post_content', 'raw' );
-
-                // No data
-                } else {
-                        $forum_content = '';
                 }
 
                 // Filter & return

src/includes/replies/functions.php

@@ -461 +461 @@
 
                 do_action( 'bbp_new_reply_post_extras', $reply_id );
 
-                /** Redirect **********************************************************/
+                /** Unapproved ********************************************************/
 
-                // Redirect to
-                $redirect_to = bbp_get_redirect_to();
+                if ( bbp_get_pending_status_id() === $reply_data['reply_status'] ) {
 
-                // Get the reply URL
-                $reply_url = bbp_get_reply_url( $reply_id, $redirect_to );
+                        // Add an error
+                        bbp_add_error( 'bbp_reply_moderated', esc_html__( 'Your reply is pending moderation.', 'bbpress' ) );
 
-                // Allow to be filtered
-                $reply_url = apply_filters( 'bbp_new_reply_redirect_to', $reply_url, $redirect_to, $reply_id );
+                /** Approved **********************************************************/
 
-                /** Successful Save ***************************************************/
+                } else {
 
-                // Redirect back to new reply
-                bbp_redirect( $reply_url );
+                        // 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 );
+
+                        // Redirect back to new reply
+                        bbp_redirect( $reply_url );
+                }
+
         /** Errors ****************************************************************/
 
         // WP_Error

src/includes/replies/template.php

@@ -2455 +2455 @@
          */
         function bbp_get_form_reply_content() {
 
+                // Default return value
+                $reply_content = '';
+
                 // Get _POST data
                 if ( bbp_is_reply_form_post_request() && isset( $_POST['bbp_reply_content'] ) ) {
-                        $reply_content = wp_unslash( $_POST['bbp_reply_content'] );
 
+                        // Use if content was not moderated
+                        if ( ! bbp_has_error( 'bbp_reply_moderated' ) ) {
+                                $reply_content = wp_unslash( $_POST['bbp_reply_content'] );
+                        }
+
                 // Get edit data
                 } elseif ( bbp_is_reply_edit() ) {
                         $reply_content = bbp_get_global_post_field( 'post_content', 'raw' );
-
-                // No data
-                } else {
-                        $reply_content = '';
                 }
 
                 // Filter & return

src/includes/topics/functions.php

@@ -364 +364 @@
 
                 do_action( 'bbp_new_topic_post_extras', $topic_id );
 
-                /** Redirect **********************************************************/
+                /** Unapproved ********************************************************/
 
-                // Redirect to
-                $redirect_to = bbp_get_redirect_to();
+                if ( bbp_get_pending_status_id() === $topic_data['post_status'] ) {
 
-                // Get the topic URL
-                $redirect_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
+                        // Add an error
+                        bbp_add_error( 'bbp_topic_moderated', esc_html__( 'Your topic is pending moderation.', 'bbpress' ) );
 
-                // Add view all?
-                if ( bbp_get_view_all() || ! empty( $view_all ) ) {
+                /** Approved **********************************************************/
 
-                        // 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 );
+                } else {
 
-                        // User cannot moderate, so redirect to forum
-                        } else {
-                                $redirect_url = bbp_get_forum_permalink( $forum_id );
-                        }
-                }
+                        // Redirect to
+                        $redirect_to = bbp_get_redirect_to();
 
-                // Allow to be filtered
-                $redirect_url = apply_filters( 'bbp_new_topic_redirect_to', $redirect_url, $redirect_to, $topic_id );
+                        // Get the topic URL
+                        $redirect_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
 
-                /** Successful Save ***************************************************/
+                        // Add view all?
+                        if ( bbp_get_view_all() || ! empty( $view_all ) ) {
 
-                // Redirect back to new topic
-                bbp_redirect( $redirect_url );
+                                // 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 );
+
+                        // Redirect back to new topic
+                        bbp_redirect( $redirect_url );
+                }
+
         /** Errors ****************************************************************/
 
         // WP_Error

src/includes/topics/template.php

@@ -3698 +3698 @@
          */
         function bbp_get_form_topic_content() {
 
+                // Default return value
+                $topic_content = '';
+
                 // Get _POST data
                 if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_content'] ) ) {
-                        $topic_content = wp_unslash( $_POST['bbp_topic_content'] );
 
+                        // Use if content was not moderated
+                        if ( ! bbp_has_error( 'bbp_topic_moderated' ) ) {
+                                $topic_content = wp_unslash( $_POST['bbp_topic_content'] );
+                        }
+
                 // Get edit data
                 } elseif ( bbp_is_topic_edit() ) {
                         $topic_content = bbp_get_global_post_field( 'post_content', 'raw' );
-
-                // No data
-                } else {
-                        $topic_content = '';
                 }
 
                 // Filter & return