Changeset 5523

Timestamp:

05/30/2017 08:36:52 PM (9 years ago)

Author:

ocean90

Message:

Support Forums: Pass post IDs to moderate capability checks.

Props SergeyBiryukov.
Fixes #2590.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• wporg-bbp-topic-resolution/inc/class-plugin.php (modified) (1 diff)
• wporg-bbp-user-badges/inc/class-plugin.php (modified) (2 diffs)

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

@@ -506 +506 @@
         }
 
-        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 {

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

@@ -397 +397 @@
      * moderator without considering if they are a keymaster.
      *
-     * @param string $user_id Optional. User ID. Assumes current reply author ID
+     * @param string $user_id Optional. User ID. Assumes current post author ID
      *                        if not provided.
      * @param bool   $strict  Optional. True if user should strictly be checked
@@ -406 +406 @@
     public function is_user_moderator( $user_id = '', $strict = false ) {
         if ( ! $user_id ) {
-            $user_id = bbp_get_reply_author_id();
-        }
-
-        return ( user_can( $user_id, 'moderate' ) || ( ! $strict && bbp_is_user_keymaster( $user_id ) ) );
+            $user_id = get_post_field( 'post_author' );
+        }
+
+        return ( user_can( $user_id, 'moderate', get_the_ID() ) || ( ! $strict && bbp_is_user_keymaster( $user_id ) ) );
     }
 }