Changeset 7191 for trunk/src/includes/replies/functions.php

Timestamp:

02/18/2021 06:31:34 AM (4 years ago)

Author:

johnjamesjacoby

Message:

Post Statuses: Audit forum/topic/reply, new/edit handlers.

This change normalizes the approaches between post types and actions, to ensure predictable behavior and avoid PHP notices from undefined status variables in certain situations.

It also adds a capability check to the bbp_topic_status condition, so that it is not engaged when the UI was not exposed in the posted form.

Props dd32.

In trunk for 2.7.0. See #3420.

File:

• trunk/src/includes/replies/functions.php (modified) (2 diffs)

trunk/src/includes/replies/functions.php

@@ -319 +319 @@
     /** Reply Status **********************************************************/
 
-    // Maybe put into moderation
+    // Default to published
+    $reply_status = bbp_get_public_status_id();
+
+    // Maybe force into pending
     if ( bbp_is_topic_pending( $topic_id ) || ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         $reply_status = bbp_get_pending_status_id();
-
-    // Default
-    } else {
-        $reply_status = bbp_get_public_status_id();
     }
 
@@ -634 +633 @@
     /** Reply Status **********************************************************/
 
-    // Maybe put into moderation
-    if ( ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
-
-        // Set post status to pending if public
-        if ( bbp_get_public_status_id() === $reply->post_status ) {
-            $reply_status = bbp_get_pending_status_id();
-        }
-
     // Use existing post_status
-    } else {
-        $reply_status = $reply->post_status;
+    $reply_status = $reply->post_status;
+
+    // Maybe force into pending
+    if ( bbp_is_reply_public( $reply_id ) && ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
+        $reply_status = bbp_get_pending_status_id();
     }