Ticket #23016: 23016.patch

wp-includes/capabilities.php

@@ -95 +95 @@
          */
         function _init () {
                 global $wpdb, $wp_user_roles;
+
                 $this->role_key = $wpdb->prefix . 'user_roles';
+
                 if ( ! empty( $wp_user_roles ) ) {
-                        $this->roles = $wp_user_roles;
+                        $this->roles  = $wp_user_roles;
                         $this->use_db = false;
                 } else {
                         $this->roles = get_option( $this->role_key );
                 }
 
-                if ( empty( $this->roles ) )
-                        return;
+                do_action_ref_array( 'wp_roles_init', array( &$this ) );
 
-                $this->role_objects = array();
-                $this->role_names =  array();
-                foreach ( array_keys( $this->roles ) as $role ) {
-                        $this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
-                        $this->role_names[$role] = $this->roles[$role]['name'];
-                }
-        }
-
-        /**
-         * Reinitialize the object
-         *
-         * Recreates the role objects. This is typically called only by switch_to_blog()
-         * after switching wpdb to a new blog ID.
-         *
-         * @since 3.5.0
-         * @access public
-         */
-        function reinit() {
-                // There is no need to reinit if using the wp_user_roles global.
-                if ( ! $this->use_db )
-                        return;
-
-                global $wpdb, $wp_user_roles;
-
-                // Duplicated from _init() to avoid an extra function call.
-                $this->role_key = $wpdb->prefix . 'user_roles';
-                $this->roles = get_option( $this->role_key );
                 if ( empty( $this->roles ) )
                         return;
 
                 $this->role_objects = array();
-                $this->role_names =  array();
+                $this->role_names   = array();
                 foreach ( array_keys( $this->roles ) as $role ) {
                         $this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
-                        $this->role_names[$role] = $this->roles[$role]['name'];
+                        $this->role_names[$role]   = $this->roles[$role]['name'];
                 }
         }
 

wp-includes/ms-blogs.php

@@ -542 +542 @@
         }
 
         if ( did_action( 'init' ) ) {
-                $wp_roles->reinit();
+                $wp_roles     = new WP_Roles();
                 $current_user = wp_get_current_user();
                 $current_user->for_blog( $new_blog );
         }