Changeset 31448

Timestamp:

02/13/2015 12:52:10 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Use get_admin_url() to get the correct My Sites URL without calling switch_to_blog() directly.

props ocean90.
see #31314.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (3 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -334 +334 @@
         return;
 
-    switch_to_blog( $wp_admin_bar->user->active_blog->blog_id );
     $wp_admin_bar->add_menu( array(
         'id'    => 'my-sites',
         'title' => __( 'My Sites' ),
-        'href'  => admin_url( 'my-sites.php' ),
-    ) );
-    restore_current_blog();
+        'href'  => get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' ),
+    ) );
 
     if ( is_super_admin() ) {
@@ -682 +680 @@
 
     if ( current_theme_supports( 'widgets' )  ) {
-        $wp_admin_bar->add_menu( array( 
-            'parent' => 'appearance', 
-            'id'     => 'widgets', 
-            'title'  => __( 'Widgets' ), 
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'appearance',
+            'id'     => 'widgets',
+            'title'  => __( 'Widgets' ),
             'href'   => admin_url( 'widgets.php' ),
             'meta'   => array(
@@ -693 +691 @@
 
         if ( current_user_can( 'customize' ) ) {
-            $wp_admin_bar->add_menu( array( 
-                'parent' => 'appearance', 
-                'id'     => 'customize-widgets', 
-                'title'  => __( 'Widgets' ), 
+            $wp_admin_bar->add_menu( array(
+                'parent' => 'appearance',
+                'id'     => 'customize-widgets',
+                'title'  => __( 'Widgets' ),
                 'href'   => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859
                 'meta'   => array(