Changeset 21485 for trunk/wp-includes/admin-bar.php

Timestamp:

08/09/2012 04:28:15 PM (12 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/admin-bar.php (modified) (5 diffs)

trunk/wp-includes/admin-bar.php

@@ -345 +345 @@
 
     foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-        // @todo Replace with some favicon lookup.
-        //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';
+        switch_to_blog( $blog->userblog_id );
+
         $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
 
@@ -356 +356 @@
             'id'        => $menu_id,
             'title'     => $blavatar . $blogname,
-            'href'      => get_admin_url( $blog->userblog_id ),
+            'href'      => admin_url(),
         ) );
 
@@ -363 +363 @@
             'id'     => $menu_id . '-d',
             'title'  => __( 'Dashboard' ),
-            'href'   => get_admin_url( $blog->userblog_id ),
-        ) );
-
-        if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
+            'href'   => admin_url(),
+        ) );
+
+        if ( current_user_can( 'edit_posts' ) ) {
             $wp_admin_bar->add_menu( array(
                 'parent' => $menu_id,
                 'id'     => $menu_id . '-n',
                 'title'  => __( 'New Post' ),
-                'href'   => get_admin_url( $blog->userblog_id, 'post-new.php' ),
+                'href'   => admin_url( 'post-new.php' ),
             ) );
             $wp_admin_bar->add_menu( array(
@@ -377 +377 @@
                 'id'     => $menu_id . '-c',
                 'title'  => __( 'Manage Comments' ),
-                'href'   => get_admin_url( $blog->userblog_id, 'edit-comments.php' ),
+                'href'   => admin_url( 'edit-comments.php' ),
             ) );
         }
@@ -385 +385 @@
             'id'     => $menu_id . '-v',
             'title'  => __( 'Visit Site' ),
-            'href'   => get_home_url( $blog->userblog_id, '/' ),
-        ) );
+            'href'   => home_url( '/' ),
+        ) );
+
+        restore_current_blog();
     }
 }