<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34122] trunk: Update links to the user profile editing screen in the admin toolbar when the current logged in user has no role on the current site.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34122">34122</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34122","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-14 17:09:58 +0000 (Mon, 14 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Update links to the user profile editing screen in the admin toolbar when the current logged in user has no role on the current site. Covers single site and Multisite and introduces tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/25162">#25162</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludescssadminbarcss">trunk/src/wp-includes/css/admin-bar.css</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2015-09-14 15:32:46 UTC (rev 34121)
+++ trunk/src/wp-includes/admin-bar.php 2015-09-14 17:09:58 UTC (rev 34122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,11 +179,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_my_account_item( $wp_admin_bar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_get_current_user();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $profile_url = get_edit_profile_url( $user_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_id )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'read' ) ) {
+ $profile_url = get_edit_profile_url( $user_id );
+ } elseif ( is_multisite() ) {
+ $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+ } else {
+ $profile_url = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user_id, 26 );
</span><span class="cx" style="display: block; padding: 0 10px"> $howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $class = empty( $avatar ) ? '' : 'with-avatar';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,11 +216,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_get_current_user();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $profile_url = get_edit_profile_url( $user_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_id )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'read' ) ) {
+ $profile_url = get_edit_profile_url( $user_id );
+ } elseif ( is_multisite() ) {
+ $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+ } else {
+ $profile_url = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_group( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'user-actions',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,14 +248,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tabindex' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( false !== $profile_url ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'user-actions',
+ 'id' => 'edit-profile',
+ 'title' => __( 'Edit My Profile' ),
+ 'href' => $profile_url,
+ ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'user-actions',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => 'edit-profile',
- 'title' => __( 'Edit My Profile' ),
- 'href' => $profile_url,
- ) );
- $wp_admin_bar->add_menu( array(
- 'parent' => 'user-actions',
</del><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'logout',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Log Out' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => wp_logout_url(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'site-name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => is_admin() ? home_url( '/' ) : admin_url(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create submenu items.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( current_user_can( 'read' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // We're on the front end, link to the Dashboard.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'site-name',
</span></span></pre></div>
<a id="trunksrcwpincludescssadminbarcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/admin-bar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/admin-bar.css 2015-09-14 15:32:46 UTC (rev 34121)
+++ trunk/src/wp-includes/css/admin-bar.css 2015-09-14 17:09:58 UTC (rev 34122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +27,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-family: Arial, sans-serif;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar .ab-empty-item {
+ cursor: default;
+}
+
+#wpadminbar .ab-empty-item,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar a.ab-item,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar > #wp-toolbar span.ab-label,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar > #wp-toolbar span.noticon {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,6 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar #wp-admin-bar-my-account.with-avatar > .ab-empty-item img,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-my-account.with-avatar > a img {
</span><span class="cx" style="display: block; padding: 0 10px"> width: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 16px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,6 +470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar.ie8 #wp-admin-bar-my-account.with-avatar > .ab-empty-item img,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar.ie8 #wp-admin-bar-my-account.with-avatar > a img {
</span><span class="cx" style="display: block; padding: 0 10px"> width: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2015-09-14 15:32:46 UTC (rev 34121)
+++ trunk/tests/phpunit/tests/adminbar.php 2015-09-14 17:09:58 UTC (rev 34122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_user = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function tearDown() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_content_post_type() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_bar = new WP_Admin_Bar;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +45,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21117
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_merging_existing_meta_values() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_bar = new WP_Admin_Bar;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_bar->add_node( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,4 +64,194 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $node = $admin_bar->get_node( 'test-node' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( 'class' => 'test-class', 'some-meta' => 'value' ), $node->meta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 25162
+ */
+ public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
+ if ( is_multisite() ) {
+ $this->markTestSkipped( 'Test does not run in multisite' );
+ }
+
+ $nobody = $this->factory->user->create( array( 'role' => '' ) );
+ $this->assertFalse( user_can( $nobody, 'read' ) );
+
+ wp_set_current_user( $nobody );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+
+ $node_site_name = $wp_admin_bar->get_node( 'site-name' );
+ $node_my_account = $wp_admin_bar->get_node( 'my-account' );
+ $node_user_info = $wp_admin_bar->get_node( 'user-info' );
+ $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );
+
+ // Site menu points to the home page instead of the admin URL
+ $this->assertEquals( home_url( '/' ), $node_site_name->href );
+
+ // No profile links as the user doesn't have any permissions on the site
+ $this->assertFalse( $node_my_account->href );
+ $this->assertFalse( $node_user_info->href );
+ $this->assertNull( $node_edit_profile );
+
+ }
+
+ /**
+ * @ticket 25162
+ */
+ public function test_admin_bar_contains_correct_links_for_users_with_role() {
+ if ( is_multisite() ) {
+ $this->markTestSkipped( 'Test does not run in multisite' );
+ }
+
+ $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
+ $this->assertTrue( user_can( $editor, 'read' ) );
+
+ wp_set_current_user( $editor );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+
+ $node_site_name = $wp_admin_bar->get_node( 'site-name' );
+ $node_my_account = $wp_admin_bar->get_node( 'my-account' );
+ $node_user_info = $wp_admin_bar->get_node( 'user-info' );
+ $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );
+
+ // Site menu points to the admin URL
+ $this->assertEquals( admin_url( '/' ), $node_site_name->href );
+
+ $profile_url = admin_url( 'profile.php' );
+
+ // Profile URLs point to profile.php
+ $this->assertEquals( $profile_url, $node_my_account->href );
+ $this->assertEquals( $profile_url, $node_user_info->href );
+ $this->assertEquals( $profile_url, $node_edit_profile->href );
+
+ }
+
+ /**
+ * @ticket 25162
+ * @group multisite
+ */
+ public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs in multisite' );
+ }
+
+ $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
+ $editor = $this->factory->user->create( array( 'role' => 'editor' ) );
+
+ $this->assertTrue( user_can( $admin, 'read' ) );
+ $this->assertTrue( user_can( $editor, 'read' ) );
+
+ $new_blog_id = $this->factory->blog->create( array(
+ 'user_id' => $admin,
+ ) );
+
+ $this->assertTrue( is_user_member_of_blog( $admin, $new_blog_id ) );
+ $this->assertFalse( is_user_member_of_blog( $editor, $new_blog_id ) );
+
+ wp_set_current_user( $editor );
+
+ switch_to_blog( $new_blog_id );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+
+ $node_site_name = $wp_admin_bar->get_node( 'site-name' );
+ $node_my_account = $wp_admin_bar->get_node( 'my-account' );
+ $node_user_info = $wp_admin_bar->get_node( 'user-info' );
+ $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );
+
+ // get primary blog
+ $primary = get_active_blog_for_user( $editor );
+ $this->assertInternalType( 'object', $primary );
+
+ // No Site menu as the user isn't a member of this blog
+ $this->assertNull( $node_site_name );
+
+ $primary_profile_url = get_admin_url( $primary->blog_id, 'profile.php' );
+
+ // Ensure the user's primary blog is not the same as the main site
+ $this->assertNotEquals( $primary_profile_url, admin_url( 'profile.php' ) );
+
+ // Profile URLs should go to the user's primary blog
+ $this->assertEquals( $primary_profile_url, $node_my_account->href );
+ $this->assertEquals( $primary_profile_url, $node_user_info->href );
+ $this->assertEquals( $primary_profile_url, $node_edit_profile->href );
+
+ restore_current_blog();
+
+ }
+
+ /**
+ * @ticket 25162
+ * @group multisite
+ */
+ public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs in multisite' );
+ }
+
+ $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
+ $nobody = $this->factory->user->create( array( 'role' => '' ) );
+
+ $this->assertTrue( user_can( $admin, 'read' ) );
+ $this->assertFalse( user_can( $nobody, 'read' ) );
+
+ $new_blog_id = $this->factory->blog->create( array(
+ 'user_id' => $admin,
+ ) );
+
+ $this->assertTrue( is_user_member_of_blog( $admin, $new_blog_id ) );
+ $this->assertFalse( is_user_member_of_blog( $nobody, $new_blog_id ) );
+ $this->assertTrue( is_user_member_of_blog( $nobody, get_current_blog_id() ) );
+
+ // Remove `$nobody` from the current blog, so they're not a member of any blog
+ $removed = remove_user_from_blog( $nobody, get_current_blog_id() );
+
+ $this->assertTrue( $removed );
+ $this->assertFalse( is_user_member_of_blog( $nobody, get_current_blog_id() ) );
+
+ wp_set_current_user( $nobody );
+
+ switch_to_blog( $new_blog_id );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+
+ $node_site_name = $wp_admin_bar->get_node( 'site-name' );
+ $node_my_account = $wp_admin_bar->get_node( 'my-account' );
+ $node_user_info = $wp_admin_bar->get_node( 'user-info' );
+ $node_edit_profile = $wp_admin_bar->get_node( 'edit-profile' );
+
+ // get primary blog
+ $primary = get_active_blog_for_user( $nobody );
+ $this->assertNull( $primary );
+
+ // No Site menu as the user isn't a member of this site
+ $this->assertNull( $node_site_name );
+
+ $user_profile_url = user_admin_url( 'profile.php' );
+
+ $this->assertNotEquals( $user_profile_url, admin_url( 'profile.php' ) );
+
+ // Profile URLs should go to the user's primary blog
+ $this->assertEquals( $user_profile_url, $node_my_account->href );
+ $this->assertEquals( $user_profile_url, $node_user_info->href );
+ $this->assertEquals( $user_profile_url, $node_edit_profile->href );
+
+ restore_current_blog();
+
+ }
+
+ protected function get_standard_admin_bar() {
+ global $wp_admin_bar;
+
+ _wp_admin_bar_init();
+
+ $this->assertTrue( is_admin_bar_showing() );
+ $this->assertInstanceOf( 'WP_Admin_Bar', $wp_admin_bar );
+
+ do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+
+ return $wp_admin_bar;
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>