Changeset 7255 for branches/2.6/src/includes/replies/functions.php

Timestamp:

06/23/2024 08:27:45 PM (18 months ago)

Author:

johnjamesjacoby

Message:

Topic/Reply: improvements to status updates.

This change includes 2 fixes:

• Prefer $topic_id over $topic->ID, and use it (instead of $forum_id) when checking for moderation capability
• Add missing logic in bbp_edit_reply_handler() that was preventing statuses from saving as intended

See #2644.

In branches/2.6, for 2.6.10.

File:

• branches/2.6/src/includes/replies/functions.php (modified) (3 diffs)

branches/2.6/src/includes/replies/functions.php

@@ -641 +641 @@
     /** Reply Status **********************************************************/
 
+    // Get available reply statuses
+    $reply_statuses = bbp_get_reply_statuses( $reply_id );
+
     // Use existing post_status
     $reply_status = $reply->post_status;
@@ -647 +650 @@
     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();
+
+    // Check for possible posted reply status
+    } elseif ( ! empty( $_POST['bbp_reply_status'] ) && in_array( $_POST['bbp_reply_status'], array_keys( $reply_statuses ), true ) ) {
+
+        // Allow capable users to explicitly override the status
+        if ( current_user_can( 'moderate', $reply_id ) ) {
+            $reply_status = sanitize_key( $_POST['bbp_reply_status'] );
+
+        // Not capable
+        } else {
+            bbp_add_error( 'bbp_edit_reply_status', __( '<strong>Error</strong>: You do not have permission to do that.', 'bbpress' ) );
+        }
     }
 
@@ -2057 +2072 @@
  *
  * @param string $where
+ * @param WP_Query $query
  * @return string
  */