Ticket #2590: 2590.diff

trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php

@@ -505 +505 @@
                         $post = get_post( $topic_id );
                 }
 
-                if ( $user_id && $post && ( user_can( $user_id, 'moderate' ) || $user_id == $post->post_author ) ) {
+                if ( $user_id && $post && ( user_can( $user_id, 'moderate', $topic_id ) || $user_id == $post->post_author ) ) {
                         $retval = true;
                 } else {
                         $retval = false;

trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php

@@ -438 +438 @@
                         $user_id = bbp_get_reply_author_id();
                 }
 
-                return ( user_can( $user_id, 'moderate' ) || ( ! $strict && bbp_is_user_keymaster( $user_id ) ) );
+                return ( user_can( $user_id, 'moderate', get_queried_object_id() ) || ( ! $strict && bbp_is_user_keymaster( $user_id ) ) );
         }
 }