Ticket #2874: 2874.2.diff

src/includes/admin/users.php

@@ -56 +56 @@
                 add_filter( 'manage_users_columns',       array( $this, 'user_role_column'        )        );
                 add_filter( 'manage_users_custom_column', array( $this, 'user_role_row'           ), 10, 3 );
 
+                // Only list bbPress roles under Forum Role, remove from WordPress' > 4.4 Site Role list.
+                if ( bbp_get_major_wp_version() >= 4.4 ) {
+                        add_filter( 'get_role_list',          array( $this, 'user_role_list_filter'   ), 10, 2 );
+                }
+
                 // Process bulk role change
                 add_action( 'load-users.php',             array( $this, 'user_role_bulk_change'   )        );
         }
@@ -262 +267 @@
                 // Pass retval through
                 return $retval;
         }
+
+        /**
+         * Filter the list of roles included in the WordPress site role list
+         *
+         * This ensures bbPress' roles are only displayed under the Forum Role list
+         * in the WordPRess USers list table
+         *
+         * @since 2.6.0 bbPress (rXXXX)
+         *
+         * @return array $roles
+         */
+        public static function user_role_list_filter( $roles, $user ) {
+
+                // Get the users role
+                $user_role = bbp_get_user_role( $user->ID );
+
+                if ( ! empty( $user_role ) ) {
+                        unset( $roles[ $user_role ] );
+                }
+                return $roles;
+        }
 }
 new BBP_Users_Admin();
 endif; // class exists

src/includes/core/abstraction.php

@@ -128 +128 @@
         // Filter & return
         return apply_filters( 'bbp_pretty_urls', $retval );
 }
+
+/**
+ * Parse the WordPress core version number
+ *
+ * @since 2.6.0
+ *
+ * @global string $wp_version
+ *
+ * @return string $wp_version
+ */
+function bbp_get_major_wp_version() {
+        global $wp_version;
+
+        return (float) $wp_version;
+}