Changeset 7268 for trunk/src/includes/topics/functions.php

Timestamp:

06/28/2024 10:02:43 PM (2 years ago)

Author:

johnjamesjacoby

Message:

Merge r7250 through r7267 from branches/2.6.

In trunk, for 2.7.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/includes/topics/functions.php (modified) (2 diffs)

trunk/src/includes/topics/functions.php

@@ -580 +580 @@
 
     // Maybe force into pending
-    if ( bbp_is_topic_public( $topic->ID ) && ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
+    if ( bbp_is_topic_public( $topic_id ) && ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
         $topic_status = bbp_get_pending_status_id();
 
@@ -587 +587 @@
 
         // Allow capable users to explicitly override the status
-        if ( current_user_can( 'moderate', $forum_id ) ) {
+        if ( current_user_can( 'moderate', $topic_id ) ) {
             $topic_status = sanitize_key( $_POST['bbp_topic_status'] );