Changeset 31981

Timestamp:

04/02/2015 05:26:22 AM (11 years ago)

Author:

jeremyfelt

Message:

Check for an active blog before generating the my-sites.php URL.

If a super admin does not have an active blog assigned to their account, $wp_admin_bar->user->active_blog will be set as null. We can then fall back to admin_url() to generate the My Sites URL.

Props SergeyBiryukov, deconf.

Fixes #31755.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (1 diff)

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

@@ -330 +330 @@
                 return;
 
+        if ( $wp_admin_bar->user->active_blog ) {
+                $my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' );
+        } else {
+                $my_sites_url = admin_url( 'my-sites.php' );
+        }
+
         $wp_admin_bar->add_menu( array(
                 'id'    => 'my-sites',
                 'title' => __( 'My Sites' ),
-                'href'  => get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' ),
+                'href'  => $my_sites_url,
         ) );