<!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>[38660] trunk: Toolbar: Update links to the about page if current user can't access the dashboard of 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/38660">38660</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/38660","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-27 19:00:35 +0000 (Tue, 27 Sep 2016)</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'>Toolbar: Update links to the about page if current user can't access the dashboard of the current site.
Add missing focus styling for menu items with an icon.
Fixes <a href="https://core.trac.wordpress.org/ticket/37949">#37949</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscolors_adminscss">trunk/src/wp-admin/css/colors/_admin.scss</a></li>
<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="trunksrcwpadmincsscolors_adminscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/colors/_admin.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/colors/_admin.scss 2016-09-27 18:17:23 UTC (rev 38659)
+++ trunk/src/wp-admin/css/colors/_admin.scss 2016-09-27 19:00:35 UTC (rev 38660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,6 +324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li:hover .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li a:focus .ab-icon:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li .ab-item:focus:before,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar li .ab-item:focus .ab-icon:before,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li.hover .ab-icon:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li.hover .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li:hover #adminbarsearch:before,
</span></span></pre></div>
<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 2016-09-27 18:17:23 UTC (rev 38659)
+++ trunk/src/wp-includes/admin-bar.php 2016-09-27 19:00:35 UTC (rev 38660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,19 +107,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Admin_Bar $wp_admin_bar
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_wp_menu( $wp_admin_bar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_admin_bar->add_menu( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'read' ) ) {
+ $about_url = self_admin_url( 'about.php' );
+ } elseif ( is_multisite() ) {
+ $about_url = get_dashboard_url( get_current_user_id(), 'about.php' );
+ } else {
+ $about_url = false;
+ }
+
+ $wp_logo_menu_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'wp-logo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => self_admin_url( 'about.php' ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => $about_url,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set tabindex="0" to make sub menus accessible when no URL is available.
+ if ( ! $about_url ) {
+ $wp_logo_menu_args['meta'] = array(
+ 'tabindex' => 0,
+ );
+ }
+
+ $wp_admin_bar->add_menu( $wp_logo_menu_args );
+
+ if ( $about_url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add "About WordPress" link
</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' => 'wp-logo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'about',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __('About WordPress'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => self_admin_url( 'about.php' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => $about_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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,10 +311,10 @@
</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"> if ( is_network_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_user_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2016-09-27 18:17:23 UTC (rev 38659)
+++ trunk/src/wp-includes/css/admin-bar.css 2016-09-27 19:00:35 UTC (rev 38660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li:hover .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li a:focus .ab-icon:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li .ab-item:focus:before,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar li .ab-item:focus .ab-icon:before,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li.hover .ab-icon:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li.hover .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li:hover #adminbarsearch:before,
</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 2016-09-27 18:17:23 UTC (rev 38659)
+++ trunk/tests/phpunit/tests/adminbar.php 2016-09-27 19:00:35 UTC (rev 38660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,4 +407,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $node );
</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 37949
+ */
+ public function test_admin_bar_does_not_add_about_page_url() {
+ wp_set_current_user( self::$no_role_id );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+ $node = $wp_admin_bar->get_node( 'wp-logo' );
+
+ $this->assertNotNull( $node );
+ $this->assertSame( false, $node->href );
+ $this->assertArrayHasKey( 'tabindex', $node->meta );
+ $this->assertSame( 0, $node->meta['tabindex'] );
+
+ wp_set_current_user( self::$editor_id );
+
+ $wp_admin_bar = $this->get_standard_admin_bar();
+ $node = $wp_admin_bar->get_node( 'wp-logo' );
+
+ $this->assertNotNull( $node );
+ $this->assertSame( admin_url( 'about.php' ), $node->href );
+ $this->assertArrayNotHasKey( 'tabindex', $node->meta );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>