Changeset 9159

Timestamp:

10/02/2019 08:20:39 AM (5 years ago)

Author:

tellyworth

Message:

HelpHub: fix role assignment for support users.

This fixes a conflict that made it impossible to set a HelpHub role for users with an existing support role.

It also removes an unnecessary edit_theme_options capability for HelpHub editors.

Props Clorith.
Fixes #4700.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc

Files:

• helphub-customroles/class-helphub-custom-roles.php (modified) (1 diff)
• helphub-manager/class-helphub-manager.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-customroles/class-helphub-custom-roles.php

@@ -223 +223 @@
         if ( empty( $GLOBALS['wp_roles']->is_role( $role ) ) ) {
             $wp_roles->add_role( $role, __( 'HelpHub Editor', 'wporg-forums' ), $default_editorroles->capabilities );
-
-            $wp_roles->add_cap( $role, 'edit_theme_options' );
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-manager/class-helphub-manager.php

@@ -182 +182 @@
         /*
          * Only allow changing roles of users that are HelpHub related, or do not already hold
-         * a role within the user hierarchy as is.
+         * a role within the user hierarchy with sufficient capabilities to modify HelpHub articles.
          *
          * This is to prevent overriding users with higher capabilities altogether.
          */
-        if ( ! empty( $user_role ) && ! isset( $helphub_roles[ $user_role ] ) ) {
+        if ( ! empty( $user_role ) && ! isset( $helphub_roles[ $user_role ] ) && user_can( bbp_get_displayed_user_id(), 'edit_posts' ) ) {
             return;
         }