Changeset 7257 for branches/2.6/src/includes/core/capabilities.php

Timestamp:

06/23/2024 09:09:20 PM (20 months ago)

Author:

johnjamesjacoby

Message:

Roles: prevent notices when calling bbp_add_forums_roles()

This change adds sanity checks around the $wp_roles parameter of the bbp_add_forums_roles() function.

It will now attempt to initialize the WP_Roles class just-in-time, but only if not already doing the wp_roles_init action (to prevent recursion).

If after all of that $wp_roles is still not what it needs to be, this function will now silently bail instead of proceeding (to prevent debug notices & errors).

Fixes #3493.

Props naxoc.

In branches/2.6, for 2.6.10.

File:

• branches/2.6/src/includes/core/capabilities.php (modified) (1 diff)

branches/2.6/src/includes/core/capabilities.php

@@ -286 +286 @@
 function bbp_add_forums_roles( $wp_roles = null ) {
 
+    // Maybe initialize WP_Roles just-in-time, but 
+    if ( empty( $wp_roles ) && ! doing_action( 'wp_roles_init' ) ) {
+        $wp_roles = wp_roles();
+    }
+
+    // Bail if unexpected param type
+    if ( ! is_a( $wp_roles, 'WP_Roles' ) ) {
+        return;
+    }
+
     // Get the dynamic roles
     $bbp_roles = bbp_get_dynamic_roles();