<!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>[39948] trunk: Multisite: Show menu items in `My Sites > Network Admin` admin bar menu based on more precise capability checks.</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/39948">39948</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/39948","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-24 16:28:30 +0000 (Tue, 24 Jan 2017)</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'>Multisite: Show menu items in `My Sites > Network Admin` admin bar menu based on more precise capability checks.
Previously the menu items would all be displayed solely based on the `manage_network` capability. This change provides parity with the network admin menu.
Unit tests for the network admin menu functionality of `wp_admin_bar_my_sites_menu()` have been added.
Props chandrapatel.
Fixes <a href="https://core.trac.wordpress.org/ticket/39082">#39082</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</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 2017-01-24 13:12:28 UTC (rev 39947)
+++ trunk/src/wp-includes/admin-bar.php 2017-01-24 16:28:30 UTC (rev 39948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,36 +451,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Dashboard' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => network_admin_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_admin_bar->add_menu( array(
- 'parent' => 'network-admin',
- 'id' => 'network-admin-s',
- 'title' => __( 'Sites' ),
- 'href' => network_admin_url( 'sites.php' ),
- ) );
- $wp_admin_bar->add_menu( array(
- 'parent' => 'network-admin',
- 'id' => 'network-admin-u',
- 'title' => __( 'Users' ),
- 'href' => network_admin_url( 'users.php' ),
- ) );
- $wp_admin_bar->add_menu( array(
- 'parent' => 'network-admin',
- 'id' => 'network-admin-t',
- 'title' => __( 'Themes' ),
- 'href' => network_admin_url( 'themes.php' ),
- ) );
- $wp_admin_bar->add_menu( array(
- 'parent' => 'network-admin',
- 'id' => 'network-admin-p',
- 'title' => __( 'Plugins' ),
- 'href' => network_admin_url( 'plugins.php' ),
- ) );
- $wp_admin_bar->add_menu( array(
- 'parent' => 'network-admin',
- 'id' => 'network-admin-o',
- 'title' => __( 'Settings' ),
- 'href' => network_admin_url( 'settings.php' ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( current_user_can( 'manage_sites' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-s',
+ 'title' => __( 'Sites' ),
+ 'href' => network_admin_url( 'sites.php' ),
+ ) );
+ }
+
+ if ( current_user_can( 'manage_network_users' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-u',
+ 'title' => __( 'Users' ),
+ 'href' => network_admin_url( 'users.php' ),
+ ) );
+ }
+
+ if ( current_user_can( 'manage_network_themes' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-t',
+ 'title' => __( 'Themes' ),
+ 'href' => network_admin_url( 'themes.php' ),
+ ) );
+ }
+
+ if ( current_user_can( 'manage_network_plugins' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-p',
+ 'title' => __( 'Plugins' ),
+ 'href' => network_admin_url( 'plugins.php' ),
+ ) );
+ }
+
+ if ( current_user_can( 'manage_network_options' ) ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-o',
+ 'title' => __( 'Settings' ),
+ 'href' => network_admin_url( 'settings.php' ),
+ ) );
+ }
</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"> // Add site links
</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 2017-01-24 13:12:28 UTC (rev 39947)
+++ trunk/tests/phpunit/tests/adminbar.php 2017-01-24 16:28:30 UTC (rev 39948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,4 +583,87 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $uuid, $query_params['changeset_uuid'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( 'changeset_uuid', $query_params['url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 39082
+ */
+ public function test_my_sites_network_menu_for_regular_user() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs in multisite' );
+ }
+
+ wp_set_current_user( self::$editor_id );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+
+ $nodes = $wp_admin_bar->get_nodes();
+ foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
+ $this->assertFalse( isset( $nodes[ $id ] ), sprintf( 'Menu item %s must not display for a regular user.', $id ) );
+ }
+ }
+
+ /**
+ * @ticket 39082
+ */
+ public function test_my_sites_network_menu_for_super_admin() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs in multisite' );
+ }
+
+ wp_set_current_user( self::$editor_id );
+
+ grant_super_admin( self::$editor_id );
+ $wp_admin_bar = $this->get_standard_admin_bar();
+ revoke_super_admin( self::$editor_id );
+
+ $nodes = $wp_admin_bar->get_nodes();
+ foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
+ $this->assertTrue( isset( $nodes[ $id ] ), sprintf( 'Menu item %s must display for a super admin.', $id ) );
+ }
+ }
+
+ /**
+ * @ticket 39082
+ */
+ public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
+ global $current_user;
+
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs in multisite' );
+ }
+
+ $network_user_caps = array( 'manage_network', 'manage_network_themes', 'manage_network_plugins' );
+
+ wp_set_current_user( self::$editor_id );
+
+ foreach ( $network_user_caps as $network_cap ) {
+ $current_user->add_cap( $network_cap );
+ }
+ $wp_admin_bar = $this->get_standard_admin_bar();
+ foreach ( $network_user_caps as $network_cap ) {
+ $current_user->remove_cap( $network_cap );
+ }
+
+ $nodes = $wp_admin_bar->get_nodes();
+ foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
+ if ( in_array( $cap, $network_user_caps ) ) {
+ $this->assertTrue( isset( $nodes[ $id ] ), sprintf( 'Menu item %1$s must display for a user with the %2$s cap.', $id, $cap ) );
+ } else {
+ $this->assertFalse( isset( $nodes[ $id ] ), sprintf( 'Menu item %1$s must not display for a user without the %2$s cap.', $id, $cap ) );
+ }
+ }
+ }
+
+ private function get_my_sites_network_menu_items() {
+ return array(
+ 'my-sites-super-admin' => 'manage_network',
+ 'network-admin' => 'manage_network',
+ 'network-admin-d' => 'manage_network',
+ 'network-admin-s' => 'manage_sites',
+ 'network-admin-u' => 'manage_network_users',
+ 'network-admin-t' => 'manage_network_themes',
+ 'network-admin-p' => 'manage_network_plugins',
+ 'network-admin-o' => 'manage_network_options',
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>