Changeset 39082 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

11/02/2016 12:30:29 AM (10 years ago)

Author:

pento

Message:

Roles/Capabilities: Add a new wp_roles_init filter.

Historically, it's been difficult to extend user roles, but reasonable to work around by waiting until after init has fired, to add custom roles and capabilities. With the addition of Locale Switching, Core now potentially loads roles before init has fired, leaving a window where custom roles and capabilities are not handled.

The new filter allows plugins to add their own custom roles whenever they're initialised (on page load, or when switching sites, for example), so that they can always be obeyed.

WP_Roles has also been tidied up a little bit, to remove duplicate code.

Props johnjamesjacoby, pento.
Fixes #23016.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (4 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -767 +767 @@
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
-        global $wpdb;
+        global $wpdb, $wp_roles;
 
         $blog_id = get_current_blog_id();
@@ -823 +823 @@
 
         if ( did_action( 'init' ) ) {
-                wp_roles()->reinit();
+                $wp_roles = new WP_Roles();
                 $current_user = wp_get_current_user();
                 $current_user->for_blog( $new_blog );
@@ -851 +851 @@
  */
 function restore_current_blog() {
-        global $wpdb;
+        global $wpdb, $wp_roles;
 
         if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
@@ -897 +897 @@
 
         if ( did_action( 'init' ) ) {
-                wp_roles()->reinit();
+                $wp_roles = new WP_Roles();
                 $current_user = wp_get_current_user();
                 $current_user->for_blog( $blog );