<!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>[24123] trunk/wp-admin/includes: Remove redundant echo calls from list tables.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24123">24123</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-04-29 01:10:50 +0000 (Mon, 29 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove redundant echo calls from list tables. Don't mix string concatenation with direct output. see <a href="http://core.trac.wordpress.org/ticket/24210">#24210</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -1415,7 +1415,7 @@
</span><span class="cx"> $parent = $parent_tag->parent;
</span><span class="cx"> $level++;
</span><span class="cx"> }
</span><del>- echo $wp_list_table->single_row( $tag, $level );
</del><ins>+ $wp_list_table->single_row( $tag, $level );
</ins><span class="cx"> wp_die();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
</span><span class="cx">
</span><span class="cx"> echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
</span><del>- echo $this->single_row_columns( $comment );
</del><ins>+ $this->single_row_columns( $comment );
</ins><span class="cx"> echo "</tr>\n";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -826,7 +826,7 @@
</span><span class="cx"> $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
</span><span class="cx">
</span><span class="cx"> echo '<tr' . $row_class . '>';
</span><del>- echo $this->single_row_columns( $item );
</del><ins>+ $this->single_row_columns( $item );
</ins><span class="cx"> echo '</tr>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -382,8 +382,10 @@
</span><span class="cx"> if ( $count >= $end )
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- if ( $count >= $start )
- echo "\t" . $this->single_row( $page, $level );
</del><ins>+ if ( $count >= $start ) {
+ echo "\t";
+ $this->single_row( $page, $level );
+ }
</ins><span class="cx">
</span><span class="cx"> $count++;
</span><span class="cx">
</span><span class="lines">@@ -397,8 +399,12 @@
</span><span class="cx"> foreach ( $orphans as $op ) {
</span><span class="cx"> if ( $count >= $end )
</span><span class="cx"> break;
</span><del>- if ( $count >= $start )
- echo "\t" . $this->single_row( $op, 0 );
</del><ins>+
+ if ( $count >= $start ) {
+ echo "\t";
+ $this->single_row( $op, 0 );
+ }
+
</ins><span class="cx"> $count++;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -444,13 +450,16 @@
</span><span class="cx"> }
</span><span class="cx"> $num_parents = count( $my_parents );
</span><span class="cx"> while ( $my_parent = array_pop( $my_parents ) ) {
</span><del>- echo "\t" . $this->single_row( $my_parent, $level - $num_parents );
</del><ins>+ echo "\t";
+ $this->single_row( $my_parent, $level - $num_parents );
</ins><span class="cx"> $num_parents--;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $count >= $start )
- echo "\t" . $this->single_row( $page, $level );
</del><ins>+ if ( $count >= $start ) {
+ echo "\t";
+ $this->single_row( $page, $level );
+ }
</ins><span class="cx">
</span><span class="cx"> $count++;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> $args['offset'] = $offset = ( $page - 1 ) * $number;
</span><span class="cx">
</span><span class="cx"> // convert it to table rows
</span><del>- $out = '';
</del><span class="cx"> $count = 0;
</span><span class="cx">
</span><span class="cx"> $terms = array();
</span><span class="lines">@@ -152,11 +151,11 @@
</span><span class="cx"> $children = _get_term_hierarchy( $taxonomy );
</span><span class="cx">
</span><span class="cx"> // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
</span><del>- $out .= $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
</del><ins>+ $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
</ins><span class="cx"> } else {
</span><span class="cx"> $terms = get_terms( $taxonomy, $args );
</span><span class="cx"> foreach ( $terms as $term )
</span><del>- $out .= $this->single_row( $term, 0, $taxonomy );
</del><ins>+ $this->single_row( $term, 0, $taxonomy );
</ins><span class="cx"> $count = $number; // Only displaying a single page.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,8 +164,6 @@
</span><span class="cx"> echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
</span><span class="cx"> $this->no_items();
</span><span class="cx"> echo '</td></tr>';
</span><del>- } else {
- echo $out;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,7 +171,6 @@
</span><span class="cx">
</span><span class="cx"> $end = $start + $per_page;
</span><span class="cx">
</span><del>- $output = '';
</del><span class="cx"> foreach ( $terms as $key => $term ) {
</span><span class="cx">
</span><span class="cx"> if ( $count >= $end )
</span><span class="lines">@@ -199,23 +195,24 @@
</span><span class="cx">
</span><span class="cx"> $num_parents = count( $my_parents );
</span><span class="cx"> while ( $my_parent = array_pop( $my_parents ) ) {
</span><del>- $output .= "\t" . $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
</del><ins>+ echo "\t";
+ $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
</ins><span class="cx"> $num_parents--;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $count >= $start )
- $output .= "\t" . $this->single_row( $term, $level, $taxonomy );
</del><ins>+ if ( $count >= $start ) {
+ echo "\t";
+ $this->single_row( $term, $level, $taxonomy );
+ }
</ins><span class="cx">
</span><span class="cx"> ++$count;
</span><span class="cx">
</span><span class="cx"> unset( $terms[$key] );
</span><span class="cx">
</span><span class="cx"> if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
</span><del>- $output .= $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
</del><ins>+ $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
</ins><span class="cx"> }
</span><del>-
- return $output;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function single_row( $tag, $level = 0 ) {
</span><span class="lines">@@ -225,7 +222,7 @@
</span><span class="cx"> $this->level = $level;
</span><span class="cx">
</span><span class="cx"> echo '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
</span><del>- echo $this->single_row_columns( $tag );
</del><ins>+ $this->single_row_columns( $tag );
</ins><span class="cx"> echo '</tr>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -1129,7 +1129,7 @@
</span><span class="cx"> return;
</span><span class="cx"> $this->done_header = true;
</span><span class="cx"> echo '<div class="wrap">';
</span><del>- echo screen_icon();
</del><ins>+ screen_icon();
</ins><span class="cx"> echo '<h2>' . $this->options['title'] . '</h2>';
</span><span class="cx"> }
</span><span class="cx"> function footer() {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
</span><del>- echo "\n\t", $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</del><ins>+ echo "\n\t" . $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (24122 => 24123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2013-04-29 00:56:27 UTC (rev 24122)
+++ trunk/wp-admin/includes/theme-install.php 2013-04-29 01:10:50 UTC (rev 24123)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> function display_theme( $theme ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.4' );
</span><span class="cx"> global $wp_list_table;
</span><del>- return $wp_list_table->single_row( $theme );
</del><ins>+ $wp_list_table->single_row( $theme );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>