Changeset 21485 for trunk/wp-includes/capabilities.php

Timestamp:

08/09/2012 04:28:15 PM (14 years ago)

Author:

ryan

Message:

switch_to_blog() and restore_current_blog() housekeeping.

wp-includes/admin-bar.php:

• Replace get_admin_url() and get_home_url() with admin_url() and home_url() and place them inside a switch/restore. Likewise replace current_user_can_for_blog() with current_user_can(). This avoids doing multiple switch restores.

wp-includes/ms-blogs.php:

• Deprecate the $validate argument to switch_to_blog(). This avoids a not very necessary call to get_blog_details(), possibly saving a few queries.
• Use $_wp_switched and $_wp_switched_stack instead of $switched and $switched_stack to make it less likely these globals will be stomped.
• Use GLOBALS to access blog_id and other globals. I've preferred this style lately since it makes it obvious a global is being used and avoids global blog_id being stomped by a local variable.
• Lose some is_object() checks. wp_get_current_user() always returns an object, for example.
• Call the new WP_Roles::reinit() method.

wp-includes/class-wp-xmlrpc-server.php:

• Replace current_user_can_for_blog() with current_user_can() and move it inside the switch/restore pair. This eliminates a switch/restore.

wp-includes/capabilities.php:

• Use array_keys() instead of $role => $data since $data is unused. I *think* this is a bit faster.
• Introduce WP_Roles::reinit(). This reinitializes WP_Roles and is used after switch_to_blog() has already update the blog ID in the wpdb object. If a global roles array is being used instead of the db, reinit is skipped.
• current_user_can_for_blog() now does a switch/restore. It didn't before meaning it could be reinitializing the user with the wrong role information for the current blog.

wp-includes/ms-settings.php:

• Define $_wp_switched_stack and $_wp_switched. This way switch_to_blog() and restore_current_blog() can rely on it being set.

wp-settings.php:

• Instantiate the WP_Roles global. This was it is always defined during init. To remove the WP_Roles checks from WP_Role and WP_User this would probably have to move before plugins are loaded, which might not be a good thing.

wp-includes/functions.php:

• Update wp_upload_dir() to reference _wp_switched.

File:

• trunk/wp-includes/capabilities.php (modified) (4 diffs)

trunk/wp-includes/capabilities.php

@@ -109 +109 @@
                 $this->role_objects = array();
                 $this->role_names =  array();
-                foreach ( (array) $this->roles as $role => $data ) {
+                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();
+                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'];
@@ -234 +264 @@
          * @return bool
          */
-        function is_role( $role )
-        {
+        function is_role( $role ) {
                 return isset( $this->role_names[$role] );
         }
@@ -1232 +1261 @@
  */
 function current_user_can_for_blog( $blog_id, $capability ) {
+        switch_to_blog( $blog_id );
+
         $current_user = wp_get_current_user();
 
@@ -1237 +1268 @@
                 return false;
 
-        // Create new object to avoid stomping the global current_user.
-        $user = new WP_User( $current_user->ID );
-
-        // Set the blog id. @todo add blog id arg to WP_User constructor?
-        $user->for_blog( $blog_id );
-
         $args = array_slice( func_get_args(), 2 );
         $args = array_merge( array( $capability ), $args );
 
-        return call_user_func_array( array( &$user, 'has_cap' ), $args );
+        $can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+
+        restore_current_blog();
+
+        return $can;
 }