<!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>[42128] trunk/src/wp-includes/class-wp-admin-bar.php: Admin Bar: Reformat the render methods.</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/42128">42128</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/42128","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-08 08:34:41 +0000 (Wed, 08 Nov 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'>Admin Bar: Reformat the render methods.
The admin bar render methods use some cute tricks which don't come close to the WordPress coding standards. So that we can more easily apply automated code fixing to the codebase, these tricks need to be removed.
See <a href="https://core.trac.wordpress.org/ticket/41057">#41057</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2017-11-07 05:46:41 UTC (rev 42127)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2017-11-08 08:34:41 UTC (rev 42128)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,11 +434,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $node->type != 'container' || empty( $node->children ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
- foreach ( $node->children as $group ) {
- $this->_render_group( $group );
- }
- ?></div><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div id="' . esc_attr( 'wp-admin-bar-' . $node->id ) . '" class="ab-group-container">';
+ foreach ( $node->children as $group ) {
+ $this->_render_group( $group );
+ }
+ echo '</div>';
</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">@@ -457,11 +457,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
- foreach ( $node->children as $item ) {
- $this->_render_item( $item );
- }
- ?></ul><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<ul id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$class>";
+ foreach ( $node->children as $item ) {
+ $this->_render_item( $item );
+ }
+ echo '</ul>';
</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">@@ -491,65 +491,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $menuclass )
</span><span class="cx" style="display: block; padding: 0 10px"> $menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<li id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
- if ( $has_link ):
- ?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
- if ( ! empty( $node->meta['onclick'] ) ) :
- ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['target'] ) ) :
- ?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['title'] ) ) :
- ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['rel'] ) ) :
- ?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['lang'] ) ) :
- ?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['dir'] ) ) :
- ?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
- endif;
- ?>><?php
- else:
- ?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
- if ( ! empty( $node->meta['title'] ) ) :
- ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['lang'] ) ) :
- ?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
- endif;
- if ( ! empty( $node->meta['dir'] ) ) :
- ?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
- endif;
- ?>><?php
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_link ) {
+ $attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );
+ echo "<a class='ab-item'$aria_attributes href='" . esc_url( $node->href ) . "'>";
+ if ( ! empty( $node->meta['onclick'] ) ) {
+ echo ' onclick="' . esc_js( $node->meta['onclick'] ) . '"';
+ }
+ } else {
+ $attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );
+ echo '<div class="ab-item ab-empty-item"' . $aria_attributes;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $node->title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $attributes as $attribute ) {
+ if ( ! empty( $node->meta[ $attribute ] ) ) {
+ echo " $attribute='" . esc_attr( $node->meta[ $attribute ] ) . '"';
+ }
+ }
</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 ( $has_link ) :
- ?></a><?php
- else:
- ?></div><?php
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ">{$node->title}";
</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_parent ) :
- ?><div class="ab-sub-wrapper"><?php
- foreach ( $node->children as $group ) {
- $this->_render_group( $group );
- }
- ?></div><?php
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_link ) {
+ echo '</a>';
+ } else {
+ echo '</div>';
+ }
</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 ( ! empty( $node->meta['html'] ) )
- echo $node->meta['html'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_parent ) {
+ echo '<div class="ab-sub-wrapper">';
+ foreach ( $node->children as $group ) {
+ $this->_render_group( $group );
+ }
+ echo '</div>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- </li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $node->meta['html'] ) ) {
+ echo $node->meta['html'];
+ }
+
+ echo '</li>';
</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></pre>
</div>
</div>
</body>
</html>