Changeset 7191 for trunk/src/includes/forums/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/forums/functions.php (modified) (4 diffs)

trunk/src/includes/forums/functions.php

@@ -243 +243 @@
     /** Forum Moderation ******************************************************/
 
-    $post_status = bbp_get_public_status_id();
+    // Default to published
+    $forum_status = bbp_get_public_status_id();
+
+    // Maybe force into pending
     if ( ! bbp_check_for_moderation( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
-        $post_status = bbp_get_pending_status_id();
+        $forum_status = bbp_get_pending_status_id();
     }
 
@@ -266 +269 @@
         'post_content'   => $forum_content,
         'post_parent'    => $forum_parent_id,
-        'post_status'    => $post_status,
+        'post_status'    => $forum_status,
         'post_type'      => bbp_get_forum_post_type(),
         'comment_status' => 'closed'
@@ -482 +485 @@
     /** Forum Moderation ******************************************************/
 
-    $post_status = bbp_get_public_status_id();
+    // Use existing post_status
+    $forum_status = $forum->post_status;
+
+    // Maybe force into pending
     if ( ! bbp_check_for_moderation( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
-        $post_status = bbp_get_pending_status_id();
+        $forum_status = bbp_get_pending_status_id();
     }
 
@@ -504 +510 @@
         'post_title'   => $forum_title,
         'post_content' => $forum_content,
-        'post_status'  => $post_status,
+        'post_status'  => $forum_status,
         'post_parent'  => $forum_parent_id
     ) );