Changeset 63490

Timestamp:

09/05/2026 05:56:32 AM (6 weeks ago)

Author:

westonruter

Message:

Role/Capability: Ensure wp_roles() returns WP_Roles.

Previously wp_roles() only checked whether the $wp_roles global was set before returning it, so any code that overwrote that global with another value caused the function to hand back something which is not a WP_Roles object. Checking instanceof instead guarantees the return type, matching the approach already used by wp_scripts() and wp_styles().

Developed in ​https://github.com/WordPress/wordpress-develop/pull/8315.
Follow-up to r32541.

Props marian1.
See #62562.
Fixes #62959.

File:

• trunk/src/wp-includes/capabilities.php (modified) (1 diff)

trunk/src/wp-includes/capabilities.php

@@ -1079 +1079 @@
  * @return WP_Roles WP_Roles global instance if not already instantiated.
  */
-function wp_roles() {
+function wp_roles(): WP_Roles {
         global $wp_roles;
 
-        if ( ! isset( $wp_roles ) ) {
+        if ( ! ( $wp_roles instanceof WP_Roles ) ) {
                 $wp_roles = new WP_Roles();
         }