Changeset 6921

Timestamp:

11/07/2019 06:56:53 PM (6 years ago)

Author:

johnjamesjacoby

Message:

Moderation: make sure pending topics (for moderation reasons) are accessible to authors.

This commit updates the logic inside of the topic & reply map-meta-cap implementations, restricting edit-lock checks to actual "Edit" screens, and using the "edit_others_posts" capability in non-"Edit" screens, ensuring that both scenarios are covered.

It also adds an explicit condition for Pending Topics to both the Topic Description and Topic Notices, alerting users as to why they are seeing what they are seeing.

Fixes #3253 (again!) See also #3164 for other related discussion & details.

Location:

trunk/src/includes

Files:

• replies/capabilities.php (modified) (1 diff)
• topics/capabilities.php (modified) (1 diff)
• topics/template.php (modified) (2 diffs)
• users/template.php (modified) (1 diff)

trunk/src/includes/replies/capabilities.php

@@ -154 +154 @@
                 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) {
 
-                    // Only allow if not past the edit-lock period
-                    $caps = ! bbp_past_edit_lock( $_post->post_date_gmt )
-                        ? array( $post_type->cap->edit_posts )
-                        : array( 'do_not_allow' );
+                    // If editing...
+                    if ( bbp_is_reply_edit() ) {
+
+                        // Only allow if not past the edit-lock period
+                        $caps = ! bbp_past_edit_lock( $_post->post_date_gmt )
+                            ? array( $post_type->cap->edit_posts )
+                            : array( 'do_not_allow' );
+
+                    // Otherwise...
+                    } else {
+                        $caps = array( $post_type->cap->edit_posts );
+                    }
 
                 // Fallback to edit_others_posts.

trunk/src/includes/topics/capabilities.php

@@ -174 +174 @@
                 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) {
 
-                    // Only allow if not past the edit-lock period
-                    $caps = ! bbp_past_edit_lock( $_post->post_date_gmt )
-                        ? array( $post_type->cap->edit_posts )
-                        : array( 'do_not_allow' );
+                    // If editing...
+                    if ( bbp_is_topic_edit() ) {
+
+                        // Only allow if not past the edit-lock period
+                        $caps = ! bbp_past_edit_lock( $_post->post_date_gmt )
+                            ? array( $post_type->cap->edit_posts )
+                            : array( 'do_not_allow' );
+
+                    // Otherwise...
+                    } else {
+                        $caps = array( $post_type->cap->edit_posts );
+                    }
 
                 // Unknown, so map to edit_others_posts

trunk/src/includes/topics/template.php

@@ -3082 +3082 @@
         // Trashed notice
         case bbp_get_trash_status_id() :
-            $notice_text = esc_html__( 'This topic is in the trash.',   'bbpress' );
+            $notice_text = esc_html__( 'This topic is in the trash.', 'bbpress' );
+            break;
+
+        // Pending notice
+        case bbp_get_pending_status_id() :
+            $notice_text = esc_html__( 'This topic is pending moderation.', 'bbpress' );
             break;
 
@@ -3336 +3341 @@
         // Topic has activity (could be from reply or topic author)
         $last_active = bbp_get_topic_last_active_id( $topic_id );
-        if ( ! empty( $last_active ) ) {
+        if ( ! empty( $vc_int ) && ! empty( $last_active ) ) {
             $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $r['size'] ) );
             $retstr          = sprintf( esc_html__( 'This topic has %1$s, %2$s, and was last updated %3$s by %4$s.', 'bbpress' ), $reply_count, $voice_count, $time_since, $last_updated_by );
 
         // Topic has no replies
-        } elseif ( ! empty( $voice_count ) && ! empty( $reply_count ) ) {
+        } elseif ( ! empty( $vc_int ) && ! empty( $reply_count ) ) {
             $retstr = sprintf( esc_html__( 'This topic has %1$s and %2$s.', 'bbpress' ), $voice_count, $reply_count );
 
         // Topic has no replies and no voices
-        } elseif ( empty( $voice_count ) && empty( $reply_count ) ) {
-            $retstr = sprintf( esc_html__( 'This topic has no replies.', 'bbpress' ), $voice_count, $reply_count );
+        } elseif ( empty( $vc_int ) && empty( $reply_count ) ) {
+            $retstr = esc_html__( 'This topic has no replies.', 'bbpress' );
+
+        // Topic is pending
+        } elseif ( bbp_get_topic_status( $topic_id ) === bbp_get_pending_status_id() ) {
+            $retstr = esc_html__( 'This topic is pending moderation.', 'bbpress' );
+
+        // Fallback
+        } else {
+            $retstr = esc_html__( 'This topic is empty.', 'bbpress' );
         }
 

trunk/src/includes/users/template.php

@@ -2290 +2290 @@
 
     // Looking at a single topic, topic is open, and forum is open
-    } elseif ( ( bbp_is_single_topic() || is_page() || is_single() ) && bbp_is_topic_open() && bbp_is_forum_open() ) {
+    } elseif ( ( bbp_is_single_topic() || is_page() || is_single() ) && bbp_is_topic_open() && bbp_is_forum_open() && bbp_is_topic_published() ) {
         $retval = bbp_current_user_can_publish_replies();