<!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>[57765] trunk/src/wp-includes: Toolbar: Polish design and code combining duplicate profile links.</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 { white-space: pre-line; 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/57765">57765</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/57765","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-04 21:48:29 +0000 (Mon, 04 Mar 2024)</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: Polish design and code combining duplicate profile links.
Fixes some design changes and improves quality of comments and code styles following previous changes. Follow-up to <a href="https://core.trac.wordpress.org/changeset/57708">[57708]</a>.
Props sabernhardt, huzaifaalmesbah, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/43633">#43633</a>. See <a href="https://core.trac.wordpress.org/ticket/34668">#34668</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludescssadminbarcss">trunk/src/wp-includes/css/admin-bar.css</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 2024-03-04 17:40:06 UTC (rev 57764)
+++ trunk/src/wp-includes/admin-bar.php 2024-03-04 21:48:29 UTC (rev 57765)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'About WordPress' ) .
</span><span class="cx" style="display: block; padding: 0 10px"> '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => $about_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_title' => __( 'About WordPress' ),
</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">@@ -286,7 +286,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => $profile_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => $class,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Current user's display name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_title' => sprintf( __( 'Howdy, %s' ), $current_user->display_name ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tabindex' => ( false !== $profile_url ) ? '' : 0,
</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">@@ -329,7 +331,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_info .= "<span class='username'>{$current_user->user_login}</span>";
</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">- $user_info .= "<span class='edit-profile'>" . __( 'Edit Profile' ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $profile_url ) {
+ $user_info .= "<span class='display-name edit-profile'>" . __( 'Edit Profile' ) . '</span>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +393,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> 'href' => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_title' => $title,
</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">@@ -990,7 +994,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'new-content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => admin_url( current( array_keys( $actions ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_title' => _x( 'New', 'admin bar menu group label' ),
</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="trunksrcwpincludesclasswpadminbarphp"></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/class-wp-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2024-03-04 17:40:06 UTC (rev 57764)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2024-03-04 21:48:29 UTC (rev 57765)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0 Added `$menu_title` parameter to allow an ARIA menu name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $node
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|bool $menu_title The accessible name of this aria menu or false if not provided.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|bool $menu_title The accessible name of this ARIA menu or false if not provided.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function _render_group( $node, $menu_title = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'container' === $node->type ) {
</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 2024-03-04 17:40:06 UTC (rev 57764)
+++ trunk/src/wp-includes/css/admin-bar.css 2024-03-04 21:48:29 UTC (rev 57765)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .shortlink-input {
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 2;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: 26px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: 1.625rem;
</ins><span class="cx" style="display: block; padding: 0 10px"> white-space: nowrap;
</span><span class="cx" style="display: block; padding: 0 10px"> min-width: 140px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,11 +447,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: none;
</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">-#wpadminbar #wp-admin-bar-user-info a {
- display: grid;
- row-gap: 12px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #wp-admin-bar-user-info .avatar {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> left: -72px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar #wp-admin-bar-user-info span {
</span><span class="cx" style="display: block; padding: 0 10px"> background: none;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: 18px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: 1.125rem;
</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"> #wpadminbar #wp-admin-bar-user-info .display-name,
</span></span></pre>
</div>
</div>
</body>
</html>