Ticket #3164: 3164.patch

src/includes/replies/capabilities.php

@@ -136 +136 @@
                                 if ( bbp_is_user_inactive( $user_id ) ) {
                                         $caps = array( 'do_not_allow' );
 
-                                // User is author so allow edit if not in admin
+                                // User is author so allow edit if not in admin, unless it's past edit lock time
                                 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) {
-                                        $caps = array( $post_type->cap->edit_posts );
+                                        if ( ! bbp_past_edit_lock( $_post->post_date_gmt ) ) {
+                                                $caps = array( $post_type->cap->edit_posts );
+                                        } elseif ( user_can( $user_id, 'moderate', $_post->ID ) ) {
+                                                $caps = array( 'spectate' );
+                                        } else {
+                                                $caps = array( 'do_not_allow' );
+                                        }
 
                                 // Moderators can always edit forum content
                                 } elseif ( user_can( $user_id, 'moderate', $_post->ID ) ) {

src/includes/topics/capabilities.php

@@ -156 +156 @@
                                 if ( bbp_is_user_inactive( $user_id ) ) {
                                         $caps = array( 'do_not_allow' );
 
-                                // User is author so allow edit if not in admin
+                                // User is author so allow edit if not in admin, unless it's past edit lock time
                                 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) {
-                                        $caps = array( $post_type->cap->edit_posts );
+                                        if ( ! bbp_past_edit_lock( $_post->post_date_gmt ) ) {
+                                                $caps = array( $post_type->cap->edit_posts );
+                                        } elseif ( user_can( $user_id, 'moderate', $_post->ID ) ) {
+                                                $caps = array( 'spectate' );
+                                        } else {
+                                                $caps = array( 'do_not_allow' );
+                                        }
 
                                 // Moderators can always edit forum content
                                 } elseif ( user_can( $user_id, 'moderate', $_post->ID ) ) {